Bug 1256701 - prevent null pointer dereference |selectedTab| in BrowserApp::enterEditingMode. r?sebastian draft
authorAndi-Bogdan Postelnicu <bogdan.postelnicu@softvision.ro>
Fri, 18 Mar 2016 11:45:54 +0200
changeset 342080 2e128b4b7f31ee66d05e934d9af68d52c620893e
parent 341451 5cfc10c14aaea2a449f74dcbb366179a45442dd6
child 516520 0909d93a574911e84c8addc02f30d2e06095c884
push id13350
push userBogdan.Postelnicu@softvision.ro
push dateFri, 18 Mar 2016 12:51:06 +0000
reviewerssebastian
bugs1256701
milestone48.0a1
Bug 1256701 - prevent null pointer dereference |selectedTab| in BrowserApp::enterEditingMode. r?sebastian MozReview-Commit-ID: CS7i40ErsPJ
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
@@ -2319,17 +2319,18 @@ public class BrowserApp extends GeckoApp
 
         final PropertyAnimator animator = new PropertyAnimator(250);
         animator.setUseHardwareLayer(false);
 
         TransitionsTracker.track(animator);
 
         mBrowserToolbar.startEditing(url, animator);
 
-        final boolean isUserSearchTerm = !TextUtils.isEmpty(selectedTab.getUserRequested());
+        final boolean isUserSearchTerm = selectedTab != null &&
+                !TextUtils.isEmpty(selectedTab.getUserRequested());
         if (isUserSearchTerm && SwitchBoard.isInExperiment(getContext(), Experiments.SEARCH_TERM)) {
             showBrowserSearchAfterAnimation(animator);
         } else {
             showHomePagerWithAnimator(panelId, animator);
         }
 
         animator.start();
         Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN);