diff options
| author | George Mount <mount@google.com> | 2011-10-12 08:18:05 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2011-10-12 09:53:45 -0700 |
| commit | a4933658e2dc348a55c466b95daf68cf6a83db60 (patch) | |
| tree | 45a7f8a3c2b33868e82acfebb4338e86bd1e1f2f /src/com/android/browser/PhoneUi.java | |
| parent | ce8bcb0d8fff390451e9c95acd89cc2bbe0f66f7 (diff) | |
| download | Browser-a4933658e2dc348a55c466b95daf68cf6a83db60.tar.gz | |
DO NOT MERGE Fix Monkey NullPointerException in data URLs.
Bug 5442979
Fixed assumption that tab would not be null in
previous change to disable bookmarking data URLs
on phones.
Change-Id: I9f032d165d0693a66a0595c33d598b14290dc974
Diffstat (limited to 'src/com/android/browser/PhoneUi.java')
| -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 2fff5fab..b0f3d741 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); |