commit d7add1efcfe800443450ecaae75839fffc64eaa1
author Michael Kolb <kolby@google.com> Mon Nov 21 14:10:23 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 14:10:23 2011 -0800
tree 8d11611def93c046ba0a25d950cc49e5926d3680
parent 81788e08713038b9b11184561e677f823c0b716b
parent a48621be8a537284f37b843388b30017b0cfce51

am a48621be: Merge "Monkey season" into ics-mr1

* commit 'a48621be8a537284f37b843388b30017b0cfce51':
  Monkey season

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index e8ae21d..52183eb 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2221,7 +2221,10 @@
         removeSubWindow(tab);
         // dismiss the subwindow. This will destroy the WebView.
         tab.dismissSubWindow();
-        getCurrentTopWebView().requestFocus();
+        WebView wv = getCurrentTopWebView();
+        if (wv != null) {
+            wv.requestFocus();
+        }
     }
 
     @Override