summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-21 14:03:56 -0800
committerMichael Kolb <kolby@google.com>2011-11-21 14:03:56 -0800
commite8c975772600287793549407927281131757868c (patch)
tree5813acaf56faf1128db5b63fefbc7545db14d25b /src
parent2edc80c2ccca9030f8013328cc2e37bc374d3d92 (diff)
downloadpackages_apps_browser-e8c975772600287793549407927281131757868c.zip
packages_apps_browser-e8c975772600287793549407927281131757868c.tar.gz
packages_apps_browser-e8c975772600287793549407927281131757868c.tar.bz2
Monkey season
Bug: 5650555 Change-Id: Ia5ea323b3abaf411c24af18193d5d9ac7f63e212
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2a57edf..e701316 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2223,7 +2223,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