diff options
| author | John Reck <jreck@google.com> | 2010-12-06 11:50:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-06 11:50:55 -0800 |
| commit | a755c61400e995ab059ecd1d40a2f2b32b4370ed (patch) | |
| tree | 8018beb584fcc252f953a18ec79531177e9bfc37 /src | |
| parent | 41861f76bcdb21104f4a43f2a9f674fc7dfac5b2 (diff) | |
| parent | f573cb6bf7726b0eddff3907f58c61e372797e0c (diff) | |
| download | packages_apps_Browser-a755c61400e995ab059ecd1d40a2f2b32b4370ed.zip packages_apps_Browser-a755c61400e995ab059ecd1d40a2f2b32b4370ed.tar.gz packages_apps_Browser-a755c61400e995ab059ecd1d40a2f2b32b4370ed.tar.bz2 | |
Merge "Fixed strict mode violation in history"
Diffstat (limited to 'src')
| -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 5cd9545..2fdfedd 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 |