commit 2b8e75c65f6780faf8a25f3ed5b28277088ad27b
author George Mount <mount@google.com> Wed Oct 12 08:18:05 2011 -0700
committer George Mount <mount@google.com> Wed Oct 12 08:18:05 2011 -0700
tree f78514255eda1643e3c327731ae74f5c3c856811
parent 7d209c5d7af3609eed22b864293c61600df08961

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: I54601e940bd2bf865a4f5a22517a92144bcf7e96

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index ddb4e0e..3ba0daa 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -196,8 +196,11 @@
     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);