commit ae6b7babd75daceaea6711e8b13baf36c98ec7a4
author Michael Kolb <kolby@google.com> Fri Aug 12 13:59:21 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 12 13:59:21 2011 -0700
tree 516782dbe6c0a9e753b0e170a6abab236bb7b29d
parent 718a24d6c9671fe2da4112a3b5f30fd3939b38e8
parent ace2ff88b860c60c634d6cd49177eb4c5413228b

Merge "Add monkey protection to editUrl"

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index a52bc56..b5497d5 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -424,7 +424,7 @@
             mUiController.endActionMode();
         }
         showTitleBar();
-        if (!getActiveTab().isSnapshot()) {
+        if ((getActiveTab() != null) && !getActiveTab().isSnapshot()) {
             mNavigationBar.startEditingUrl(clearInput);
         }
     }