Merge change Ia964056a into eclair-mr2
* changes:
Revert "Do not allow javascript to change window focus."
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) {