Merge "Lower snapshot size limit" into ics-mr0
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 2fff5fa..b0f3d74 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);