Merge "Add missing null check" into jb-dev

2012-05-02 16:15:51 -07:00
parent 9a671137dc 273b8c2e7f
commit 9a793c91b6
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -4355,7 +4355,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
    }

    private void removeTouchHighlight() {
-        mWebViewCore.removeMessages(EventHub.HIT_TEST);
+        if (mWebViewCore != null) {
+            mWebViewCore.removeMessages(EventHub.HIT_TEST);
+        }
        mPrivateHandler.removeMessages(HIT_TEST_RESULT);
        setTouchHighlightRects(null);
    }