diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-30 09:58:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 09:58:21 -0800 |
| commit | a4c9f8dec60a8c62b30581e4e1cfb68f3e1d6fe7 (patch) | |
| tree | d8d06b6d358fa285159bc9f380ae7b46bb91ffd9 /src/com | |
| parent | baa898f3cc14192a671dcdc51b7904d870f89f2c (diff) | |
| parent | c5b0b2db3b917e658700642763fb50da0057716b (diff) | |
| download | packages_apps_browser-a4c9f8dec60a8c62b30581e4e1cfb68f3e1d6fe7.zip packages_apps_browser-a4c9f8dec60a8c62b30581e4e1cfb68f3e1d6fe7.tar.gz packages_apps_browser-a4c9f8dec60a8c62b30581e4e1cfb68f3e1d6fe7.tar.bz2 | |
am c5b0b2db: Fix yet another Monkey NPE
* commit 'c5b0b2db3b917e658700642763fb50da0057716b':
Fix yet another Monkey NPE
Diffstat (limited to 'src/com')
| -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 581d39a..9683a47 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1880,7 +1880,8 @@ public class Controller } boolean isInLoad() { - return getCurrentTab().inPageLoad(); + final Tab tab = getCurrentTab(); + return (tab != null) && tab.inPageLoad(); } // bookmark handling |