diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-06-05 11:04:45 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-06-05 14:02:57 -0400 |
| commit | 0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8 (patch) | |
| tree | 0420746af4f22612035e773d3d0a6aa5eb998b3c /src/com/android/browser/BrowserActivity.java | |
| parent | bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63 (diff) | |
| download | packages_apps_Browser-0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8.tar.gz packages_apps_Browser-0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8.tar.bz2 packages_apps_Browser-0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8.zip | |
Fix a monkey crash.
The monkey crashed because getTopWindow() returned null.
Ensure that we either have a top window, or we are in
the tab picker. If neither is true, return false, to
avoid the null pointer exception.
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 53814f2f1..3252da3a7 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1387,6 +1387,9 @@ public class BrowserActivity extends Activity 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( @@ -1442,6 +1445,9 @@ public class BrowserActivity extends Activity // menu key. return false; } + if (null == mTabOverview && null == getTopWindow()) { + return false; + } switch (item.getItemId()) { // -- Main menu case R.id.goto_menu_id: { |
