summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-29 16:13:35 -0800
committerMichael Kolb <kolby@google.com>2011-11-29 16:13:35 -0800
commitc5b0b2db3b917e658700642763fb50da0057716b (patch)
treef3dc9d7ad53d8a85a9153a9364940520d86b74e9 /src
parenta33179189aae473eeb4d2c5d239c5a5caee66598 (diff)
downloadpackages_apps_browser-c5b0b2db3b917e658700642763fb50da0057716b.zip
packages_apps_browser-c5b0b2db3b917e658700642763fb50da0057716b.tar.gz
packages_apps_browser-c5b0b2db3b917e658700642763fb50da0057716b.tar.bz2
Fix yet another Monkey NPE
Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 8dc05f8..8238d77 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1876,7 +1876,8 @@ public class Controller
}
boolean isInLoad() {
- return getCurrentTab().inPageLoad();
+ final Tab tab = getCurrentTab();
+ return (tab != null) && tab.inPageLoad();
}
// bookmark handling