Skip to content

Commit f920271

Browse files
jreckAndroid (Google) Code Review
authored andcommitted
Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
2 parents 81efbb3 + 1612fab commit f920271

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

core/java/android/webkit/WebViewClassic.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6987,6 +6987,8 @@ private void overrideLoading(String url) {
69876987

69886988
@Override
69896989
public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
6990+
// Check if we are destroyed
6991+
if (mWebViewCore == null) return false;
69906992
// FIXME: If a subwindow is showing find, and the user touches the
69916993
// background window, it can steal focus.
69926994
if (mFindIsUp) return false;

0 commit comments

Comments
 (0)