commit 4af206a6f656a27cfd4004241e1b84e05489eb94
author Android (Google) Code Review <android-gerrit@google.com> Thu Nov 19 11:48:07 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 19 11:48:07 2009 -0800
tree 2aa2c1f3a1d7db64f22fe2a2af5201b82fec89b7
parent bb394f3e134b6e5898ef7ae861b75e95e618688f
parent eb5061b8e5de8ccb3667f002ef3ec6732a7d78ba

Merge change Ia964056a into eclair-mr2

* changes:
  Revert "Do not allow javascript to change window focus."

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) {