diff options
author | John Reck <jreck@google.com> | 2011-08-19 15:16:05 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-08-19 15:16:05 -0700 |
commit | 54ed3aa8417f4c6a27eecb9caf10f742a705b6e0 (patch) | |
tree | 3cbc53a5959521b1cb19123286f206850af9644a | |
parent | 42229bcdea8a1623d9ac3fce099793a3767fb14d (diff) | |
download | packages_apps_browser-54ed3aa8417f4c6a27eecb9caf10f742a705b6e0.zip packages_apps_browser-54ed3aa8417f4c6a27eecb9caf10f742a705b6e0.tar.gz packages_apps_browser-54ed3aa8417f4c6a27eecb9caf10f742a705b6e0.tar.bz2 |
Fix crash
Bug: 5180400
onContextItemSelected is apparantly unordered and goes to the
"wrong" fragment first, causing this crash
Change-Id: I8d9df87d5799882190bc0fdfee5720c97d2b8f7a
-rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 5 | ||||
-rw-r--r-- | src/com/android/browser/BrowserHistoryPage.java | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 46521cb..2c38334 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -154,7 +154,10 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte @Override public boolean onContextItemSelected(MenuItem item) { - BookmarkContextMenuInfo i = (BookmarkContextMenuInfo)item.getMenuInfo(); + if (!(item.getMenuInfo() instanceof BookmarkContextMenuInfo)) { + return false; + } + BookmarkContextMenuInfo i = (BookmarkContextMenuInfo) item.getMenuInfo(); // If we have no menu info, we can't tell which item was selected. if (i == null) { return false; diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 6625e55..09c6f97 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -388,7 +388,11 @@ public class BrowserHistoryPage extends Fragment if (menuInfo == null) { return false; } - HistoryItem historyItem = (HistoryItem) getTargetView(menuInfo); + View targetView = getTargetView(menuInfo); + if (!(targetView instanceof HistoryItem)) { + return false; + } + HistoryItem historyItem = (HistoryItem) targetView; String url = historyItem.getUrl(); String title = historyItem.getName(); Activity activity = getActivity(); |