commit a755c61400e995ab059ecd1d40a2f2b32b4370ed
author John Reck <jreck@google.com> Mon Dec 06 11:50:55 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 06 11:50:55 2010 -0800
tree 8018beb584fcc252f953a18ec79531177e9bfc37
parent 41861f76bcdb21104f4a43f2a9f674fc7dfac5b2
parent f573cb6bf7726b0eddff3907f58c61e372797e0c

Merge "Fixed strict mode violation in history"

src/com/android/browser/BrowserHistoryPage.java

diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 5cd9545..2fdfedd 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -214,7 +214,7 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.clear_history_menu_id).setVisible(
-                Browser.canClearHistory(getActivity().getContentResolver()));
+                mAdapter != null && !mAdapter.isEmpty());
     }
 
     @Override