diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-29 16:32:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 16:32:57 -0800 |
| commit | 958e2277685fe9f82371b44623cea5d33b57c7f2 (patch) | |
| tree | f3dc9d7ad53d8a85a9153a9364940520d86b74e9 | |
| parent | bf1c22c5ca2fbc274638c84da7df0248d17717ed (diff) | |
| parent | c5b0b2db3b917e658700642763fb50da0057716b (diff) | |
| download | android_packages_apps_Gello-958e2277685fe9f82371b44623cea5d33b57c7f2.tar.gz android_packages_apps_Gello-958e2277685fe9f82371b44623cea5d33b57c7f2.tar.bz2 android_packages_apps_Gello-958e2277685fe9f82371b44623cea5d33b57c7f2.zip | |
am c5b0b2db: Fix yet another Monkey NPE
* commit 'c5b0b2db3b917e658700642763fb50da0057716b':
Fix yet another Monkey NPE
| -rw-r--r-- | src/com/android/browser/Controller.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 8dc05f8f..8238d772 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 |