Monkeys are touching my destroyed stuff

jreck · jreck · commit 026bb684beb5 · 2012-05-04T10:25:43.000-07:00
Bug: 6443402

Change-Id: I4e992d8d0f53958f0cbeb405f30635e0d172009f
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -5827,7 +5827,7 @@ private void handleTouchEventCommon(MotionEvent event, int action, int x, int y)
                     }
                     data.mSlop = viewToContentDimension(mNavSlop);
                     removeTouchHighlight();
-                    if (!mBlockWebkitViewMessages) {
+                    if (!mBlockWebkitViewMessages && mWebViewCore != null) {
                         mWebViewCore.sendMessageAtFrontOfQueue(
                                 EventHub.HIT_TEST, data);
                     }

Original file line number	Diff line number	Diff line change
`@@ -5827,7 +5827,7 @@ private void handleTouchEventCommon(MotionEvent event, int action, int x, int y)`
`5827`	`5827`	`}`
`5828`	`5828`	`data.mSlop = viewToContentDimension(mNavSlop);`
`5829`	`5829`	`removeTouchHighlight();`
`5830`		`- if (!mBlockWebkitViewMessages) {`
	`5830`	`+ if (!mBlockWebkitViewMessages && mWebViewCore != null) {`
`5831`	`5831`	`mWebViewCore.sendMessageAtFrontOfQueue(`
`5832`	`5832`	`EventHub.HIT_TEST, data);`
`5833`	`5833`	`}`