commit 676c5c8cd7f6a70948baa11606753dffa96e8d1e
author Eric Fischer <enf@google.com> Mon Aug 22 12:11:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 22 12:11:34 2011 -0700
tree a888bd2c7237dfbd51fb17fc7c1b0a9f75f436fc
parent 54ed3aa8417f4c6a27eecb9caf10f742a705b6e0
parent c64fd5bc24b16737f3c3cbf2459d22b1e97aa600

Merge "Import revised translations."

src/com/android/browser/BrowserBookmarksPage.java

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 @@
 
     @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;

src/com/android/browser/BrowserHistoryPage.java

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 @@
         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();