From f573cb6bf7726b0eddff3907f58c61e372797e0c Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 6 Dec 2010 11:11:34 -0800 Subject: Fixed strict mode violation in history Bug: 3257747 Fixes a strict mode violation in BrowserHistoryPage. onPrepareOptionsMenu is doing a query on the UI thread to determine if it should show clear history or not. Fixed by having it ask the adapter, which is loaded async Change-Id: I12338987098d093e63f1944f2a1458ad962d0c78 --- src/com/android/browser/BrowserHistoryPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/browser/BrowserHistoryPage.java') diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 5cd9545d6..2fdfedd30 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -214,7 +214,7 @@ public class BrowserHistoryPage extends Fragment @Override public void onPrepareOptionsMenu(Menu menu) { menu.findItem(R.id.clear_history_menu_id).setVisible( - Browser.canClearHistory(getActivity().getContentResolver())); + mAdapter != null && !mAdapter.isEmpty()); } @Override -- cgit v1.2.3