commit 28292bc903909245339baa36890c04286ef31a4d
author Grace Kloba <klobag@google.com> Thu Nov 19 10:44:15 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 19 10:44:15 2009 -0800
tree 6846a9b4692dfcf8ba9b9c13c826fa29aecb39a0
parent a5a5fa3a09ea42c05ad7d9d484aab7a5b8ec64eb
parent bb394f3e134b6e5898ef7ae861b75e95e618688f

am bb394f3e: Fix monkey crash. Check null for the top window in onActivityResult.

Merge commit 'bb394f3e134b6e5898ef7ae861b75e95e618688f' into eclair-mr2-plus-aosp

* commit 'bb394f3e134b6e5898ef7ae861b75e95e618688f':
  Fix monkey crash. Check null for the top window in

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index c50c659..55e3dda 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -3322,6 +3322,8 @@
     @Override
     protected void onActivityResult(int requestCode, int resultCode,
                                     Intent intent) {
+        if (getTopWindow() == null) return;
+
         switch (requestCode) {
             case COMBO_PAGE:
                 if (resultCode == RESULT_OK && intent != null) {