diff options
| author | Grace Kloba <klobag@google.com> | 2009-11-19 10:49:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 10:49:17 -0800 |
| commit | eb33dc1f68142cf51324d87babc12bd20f9660b0 (patch) | |
| tree | 87ad79b7dedb3414712e214698c7122fb36db710 /src/com/android/browser/BrowserActivity.java | |
| parent | a333ec790b97da9b55799e83db600bfb644aea23 (diff) | |
| parent | 28292bc903909245339baa36890c04286ef31a4d (diff) | |
am 28292bc9: am bb394f3e: Fix monkey crash. Check null for the top window in onActivityResult.
Merge commit '28292bc903909245339baa36890c04286ef31a4d'
* commit '28292bc903909245339baa36890c04286ef31a4d':
Fix monkey crash. Check null for the top window in
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index a3a871db..bef79493 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -3402,6 +3402,8 @@ public class BrowserActivity extends Activity @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) { |