Merge "Monkeys are touching my destroyed stuff" into jb-dev

2012-05-04 10:29:10 -07:00
parent e825b3e3d4 026bb684be
commit 90673b9d0e
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -5827,7 +5827,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
                    }
                    data.mSlop = viewToContentDimension(mNavSlop);
                    removeTouchHighlight();
-                    if (!mBlockWebkitViewMessages) {
+                    if (!mBlockWebkitViewMessages && mWebViewCore != null) {
                        mWebViewCore.sendMessageAtFrontOfQueue(
                                EventHub.HIT_TEST, data);
                    }