diff options
| author | Bart Sears <bsears@google.com> | 2011-11-28 18:49:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 18:49:47 -0800 |
| commit | 164eeed6358cb6c4fece427ba12eaca6a65458d6 (patch) | |
| tree | a89e75c64366015951eaab4cbdbed1e04804e510 /src | |
| parent | 9af2142ef56bece117422bf7b463c3e506b80c75 (diff) | |
| parent | 7431a694054d56b5d56410f708f97bc2a81ae5e3 (diff) | |
| download | packages_apps_browser-164eeed6358cb6c4fece427ba12eaca6a65458d6.zip packages_apps_browser-164eeed6358cb6c4fece427ba12eaca6a65458d6.tar.gz packages_apps_browser-164eeed6358cb6c4fece427ba12eaca6a65458d6.tar.bz2 | |
am 7431a694: Merge "Fix NPE at startup" into ics-mr1
* commit '7431a694054d56b5d56410f708f97bc2a81ae5e3':
Fix NPE at startup
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/Controller.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 7c73411..581d39a 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1436,7 +1436,7 @@ public class Controller return; } MenuItem dest = menu.findItem(R.id.stop_reload_menu_id); - MenuItem src = tab.inPageLoad() ? + MenuItem src = ((tab != null) && tab.inPageLoad()) ? menu.findItem(R.id.stop_menu_id): menu.findItem(R.id.reload_menu_id); if (src != null) { |