summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BaseUi.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-08-12 13:59:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 13:59:21 -0700
commitae6b7babd75daceaea6711e8b13baf36c98ec7a4 (patch)
tree516782dbe6c0a9e753b0e170a6abab236bb7b29d /src/com/android/browser/BaseUi.java
parent718a24d6c9671fe2da4112a3b5f30fd3939b38e8 (diff)
parentace2ff88b860c60c634d6cd49177eb4c5413228b (diff)
downloadpackages_apps_Browser-ae6b7babd75daceaea6711e8b13baf36c98ec7a4.zip
packages_apps_Browser-ae6b7babd75daceaea6711e8b13baf36c98ec7a4.tar.gz
packages_apps_Browser-ae6b7babd75daceaea6711e8b13baf36c98ec7a4.tar.bz2
Merge "Add monkey protection to editUrl"
Diffstat (limited to 'src/com/android/browser/BaseUi.java')
-rw-r--r--src/com/android/browser/BaseUi.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public abstract class BaseUi implements UI {
mUiController.endActionMode();
}
showTitleBar();
- if (!getActiveTab().isSnapshot()) {
+ if ((getActiveTab() != null) && !getActiveTab().isSnapshot()) {
mNavigationBar.startEditingUrl(clearInput);
}
}