diff options
| author | John Reck <jreck@google.com> | 2012-08-27 16:44:39 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-08-27 16:44:39 -0700 |
| commit | 1612fab07b36959fe02fa13616f08413abf598ae (patch) | |
| tree | 2ee493e28bd792b5dcf8819bca379350ce61c440 | |
| parent | af18865486df1e23e2951983fb0d1d4bf17f4f32 (diff) | |
Protect against focus changes after .destroy()
Bug: 7026042
Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 9df485282f42..86e7f9b078bb 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -6981,6 +6981,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc @Override public boolean requestFocus(int direction, Rect previouslyFocusedRect) { + // Check if we are destroyed + if (mWebViewCore == null) return false; // FIXME: If a subwindow is showing find, and the user touches the // background window, it can steal focus. if (mFindIsUp) return false; |