Bug 1352133 - Check if selected tab is null when stop editing toolbar. r?sebastian
MozReview-Commit-ID: 4hI3uNAGoiZ
--- 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);