Bug 1352133 - Check if selected tab is null when stop editing toolbar. r?sebastian draft
authorNevin Chen <cnevinchen@gmail.com>
Mon, 10 Jul 2017 17:54:25 +0800
changeset 606088 3c90b1e7d13888a5a8023806340135fce0c51959
parent 605863 a418121d46250f91728b86d9eea331029c264c30
child 636676 d8992c46b44619d2e94730e7850d25ee2bd7a3de
push id67605
push userbmo:cnevinchen@gmail.com
push dateMon, 10 Jul 2017 09:55:53 +0000
reviewerssebastian
bugs1352133
milestone56.0a1
Bug 1352133 - Check if selected tab is null when stop editing toolbar. r?sebastian MozReview-Commit-ID: 4hI3uNAGoiZ
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3120,21 +3120,24 @@ public class BrowserApp extends GeckoApp
         // BrowserSearch in the foreground if we use BrowserSearch.onStart/Stop.
         getWindow().setBackgroundDrawableResource(android.R.color.white);
     }
 
     private void hideBrowserSearch() {
         if (!mBrowserSearch.getUserVisibleHint()) {
             return;
         }
-
-        // To prevent overdraw, the HomePager is hidden when BrowserSearch is displayed:
-        // reverse that.
-        showHomePager(Tabs.getInstance().getSelectedTab().getMostRecentHomePanel(),
-                Tabs.getInstance().getSelectedTab().getMostRecentHomePanelData());
+        final Tab selectedTab = Tabs.getInstance().getSelectedTab();
+        if (selectedTab != null) {
+            // To prevent overdraw, the HomePager is hidden when BrowserSearch is displayed:
+            // reverse that.
+            final String mostRecentHomePanel = selectedTab.getMostRecentHomePanel();
+            showHomePager(mostRecentHomePanel,
+                    selectedTab.getMostRecentHomePanelData());
+        }
 
         mBrowserSearchContainer.setVisibility(View.INVISIBLE);
 
         getSupportFragmentManager().beginTransaction()
                 .hide(mBrowserSearch).commitAllowingStateLoss();
         mBrowserSearch.setUserVisibleHint(false);
 
         getWindow().setBackgroundDrawable(null);