diff options
| author | George Mount <mount@google.com> | 2011-10-05 15:33:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-05 15:33:46 -0700 |
| commit | 67f9d32e5ed55b15b84be4d0bdff828d48abe2eb (patch) | |
| tree | a8c9eef71ce2e54c4dea243ec0c0bbb625d0e80f /core/java/android/webkit/WebTextView.java | |
| parent | 1302d32996100233826598040a8c55bfbecb9322 (diff) | |
| parent | 1fa26cbfc883ef76a46234d104906a1a9a515fc5 (diff) | |
Merge "Fix monkey NullPointerException"
Diffstat (limited to 'core/java/android/webkit/WebTextView.java')
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 092e2b5d6dbc..33f84a508f02 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -768,9 +768,13 @@ import junit.framework.Assert; imm.hideSoftInputFromWindow(getWindowToken(), 0); } mInsideRemove = true; + boolean isFocused = hasFocus(); mWebView.removeView(this); - mWebView.requestFocus(); + if (isFocused) { + mWebView.requestFocus(); + } mInsideRemove = false; + mHandler.removeCallbacksAndMessages(null); } @Override |