diff options
| author | John Reck <jreck@google.com> | 2010-12-06 11:11:34 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-12-06 11:11:34 -0800 |
| commit | f573cb6bf7726b0eddff3907f58c61e372797e0c (patch) | |
| tree | 8756bb200f286bb943444683b506acb7e9e9e68a /src/com/android | |
| parent | 5c2f0f309c8a58b2f582f2f83bd8173eb7ae360a (diff) | |
| download | packages_apps_Browser-f573cb6bf7726b0eddff3907f58c61e372797e0c.tar.gz packages_apps_Browser-f573cb6bf7726b0eddff3907f58c61e372797e0c.tar.bz2 packages_apps_Browser-f573cb6bf7726b0eddff3907f58c61e372797e0c.zip | |
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
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserHistoryPage.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 |