summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-29 16:13:35 -0800
committerThe Android Automerger <android-build@android.com>2011-11-29 17:08:14 -0800
commite9cb04e9ebd2656f40bf51502d3ef87366494b84 (patch)
tree400e4f738f9cce54774701026e8b47ab3a81bf72
parent70286b74f6d43ee4a195be9a3d27b4945bd3ca49 (diff)
downloadpackages_apps_browser-e9cb04e9ebd2656f40bf51502d3ef87366494b84.zip
packages_apps_browser-e9cb04e9ebd2656f40bf51502d3ef87366494b84.tar.gz
packages_apps_browser-e9cb04e9ebd2656f40bf51502d3ef87366494b84.tar.bz2
Fix yet another Monkey NPE
Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
-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