From 2b8e75c65f6780faf8a25f3ed5b28277088ad27b Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Wed, 12 Oct 2011 08:18:05 -0700
Subject: 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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/com/android/browser')

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index ddb4e0e0c..3ba0daac5 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);
-- 
cgit v1.2.3