diff options
| author | Bart Sears <bsears@google.com> | 2011-11-28 18:46:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-28 18:46:07 -0800 |
| commit | 7431a694054d56b5d56410f708f97bc2a81ae5e3 (patch) | |
| tree | f110814bc94da08b429f3723600410e5a34de1d3 /src | |
| parent | 6cfe97725ede972940bf3090a4474b1e2c017a9f (diff) | |
| parent | b8337131d2e1b9a3ad0d8f619c47407b4349ea89 (diff) | |
| download | packages_apps_browser-7431a694054d56b5d56410f708f97bc2a81ae5e3.zip packages_apps_browser-7431a694054d56b5d56410f708f97bc2a81ae5e3.tar.gz packages_apps_browser-7431a694054d56b5d56410f708f97bc2a81ae5e3.tar.bz2 | |
Merge "Fix NPE at startup" into ics-mr1
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 52183eb..8dc05f8 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1425,7 +1425,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) { |