diff options
| author | George Mount <mount@google.com> | 2011-10-12 16:06:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 16:06:57 -0700 |
| commit | d7df3a0fcb18722c867ea91f794adbfaf47c60d3 (patch) | |
| tree | 0fcb281970e2e40d492ef5474402a89f724e9b25 /src/com/android/browser | |
| parent | 05d904f619cd3cb9205399c2178a3678d423a6cb (diff) | |
| parent | 2b8e75c65f6780faf8a25f3ed5b28277088ad27b (diff) | |
| download | packages_apps_Browser-d7df3a0fcb18722c867ea91f794adbfaf47c60d3.tar.gz packages_apps_Browser-d7df3a0fcb18722c867ea91f794adbfaf47c60d3.tar.bz2 packages_apps_Browser-d7df3a0fcb18722c867ea91f794adbfaf47c60d3.zip | |
Merge "Fix Monkey NullPointerException in data URLs."
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 2fff5fabc..b0f3d7412 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -196,8 +196,11 @@ public class PhoneUi extends BaseUi { public void updateMenuState(Tab tab, Menu menu) { MenuItem bm = menu.findItem(R.id.bookmarks_menu_id); if (bm != null) { - String url = tab.getUrl(); - boolean isDataUrl = DataUri.isDataUri(url); + boolean isDataUrl = false; + if (tab != null) { + String url = tab.getUrl(); + isDataUrl = DataUri.isDataUri(url); + } bm.setVisible(!showingNavScreen() && !isDataUrl); } MenuItem nt = menu.findItem(R.id.new_tab_menu_id); |