summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-15 15:30:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-15 15:30:13 -0800
commit08952b047801ed0f00f7433ad238d539b2c22c13 (patch)
tree6bc946081c93a058fdbe7ef2ada1933b33a13f50
parent004df58a3e95fd81c334390af7850517ce02e51a (diff)
parent6645084149895ec23ed325c1c93003456144f1f2 (diff)
downloadpackages_apps_Browser-08952b047801ed0f00f7433ad238d539b2c22c13.zip
packages_apps_Browser-08952b047801ed0f00f7433ad238d539b2c22c13.tar.gz
packages_apps_Browser-08952b047801ed0f00f7433ad238d539b2c22c13.tar.bz2
Merge "fix monkey NPE"
-rw-r--r--src/com/android/browser/NavigationBarTablet.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java
index 04f372a..026e903 100644
--- a/src/com/android/browser/NavigationBarTablet.java
+++ b/src/com/android/browser/NavigationBarTablet.java
@@ -261,7 +261,9 @@ public class NavigationBarTablet extends NavigationBarBase {
if (mTitleBar.isInLoad()) {
mUiController.stopLoading();
} else {
- mUiController.getCurrentTopWebView().reload();
+ if (mUiController.getCurrentTopWebView() != null) {
+ mUiController.getCurrentTopWebView().reload();
+ }
}
}