diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-21 21:07:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:07:31 -0800 |
| commit | f87fd100e613ca62490160fec11fe3401ae34917 (patch) | |
| tree | 6cc94360808e0f3affefbe8c91a26d34740d92f8 /src | |
| parent | 39448616f7fcb7c47a69408af0f7c76e3663db81 (diff) | |
| parent | a48621be8a537284f37b843388b30017b0cfce51 (diff) | |
| download | packages_apps_browser-f87fd100e613ca62490160fec11fe3401ae34917.zip packages_apps_browser-f87fd100e613ca62490160fec11fe3401ae34917.tar.gz packages_apps_browser-f87fd100e613ca62490160fec11fe3401ae34917.tar.bz2 | |
am a48621be: Merge "Monkey season" into ics-mr1
* commit 'a48621be8a537284f37b843388b30017b0cfce51':
Monkey season
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/Controller.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 710c844..e08dc15 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -2214,7 +2214,10 @@ public class Controller removeSubWindow(tab); // dismiss the subwindow. This will destroy the WebView. tab.dismissSubWindow(); - getCurrentTopWebView().requestFocus(); + WebView wv = getCurrentTopWebView(); + if (wv != null) { + wv.requestFocus(); + } } @Override |