commit 0e85b6296013439449b9ca9e067f0c486178eb39
author Leon Scroggins <scroggo@google.com> Fri Jun 05 11:41:24 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Jun 05 11:41:24 2009 -0700
tree 4990544d07327585861036903801dd852f9aabd7
parent 7db26347577132b8c4def47ccd410e7b9d0821bb
parent 0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8

am 0d7ae0ed: Fix a monkey crash.

Merge commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8'

* commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8':
  Fix a monkey crash.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index f29ac28..15e07f7 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1501,6 +1501,9 @@
         mCanChord = true;
         int id = item.getItemId();
         final WebView webView = getTopWindow();
+        if (null == webView) {
+            return false;
+        }
         final HashMap hrefMap = new HashMap();
         hrefMap.put("webview", webView);
         final Message msg = mHandler.obtainMessage(
@@ -1556,6 +1559,9 @@
             // menu key.
             return false;
         }
+        if (null == mTabOverview && null == getTopWindow()) {
+            return false;
+        }
         switch (item.getItemId()) {
             // -- Main menu
             case R.id.goto_menu_id: {