commit c87b7705a0207798b3dc9168f4e91ebbe21f08a7
author John Reck <jreck@google.com> Mon Aug 29 11:45:30 2011 -0700
committer John Reck <jreck@google.com> Mon Aug 29 11:48:56 2011 -0700
tree f34edd944538596d86c314f9ce6bd63b0511c39d
parent 05ef04394ec5400bb0b03ea52ffb1bade6769520

Fix contentInvalidateAll NPE

 Bug: 5220835
 It is possible to call setProperty before webcore has initialized.
 In that case, the content invalidate is unnecessary as there is no
 content to invalidate, so just ignore the request.

Change-Id: I52471a1739443ba8f1e514a5908678552246d80b

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6238b72..318e75d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9120,7 +9120,9 @@
 
     /** @hide send content invalidate */
     protected void contentInvalidateAll() {
-        mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);
+        if (mWebViewCore != null && !mBlockWebkitViewMessages) {
+            mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);
+        }
     }
 
     /** @hide call pageSwapCallback upon next page swap */