diff options
| author | John Reck <jreck@google.com> | 2011-08-29 17:14:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-29 17:14:11 -0700 |
| commit | 30cca6020df6fede4043a9f6715be470d3132c57 (patch) | |
| tree | efabc2e37b54a33b2a27cfc6f5515fa57e1de37b /core/java/android/webkit/WebView.java | |
| parent | d56b3c952469a63aa9d4fc860be24b80a4b0e3b6 (diff) | |
| parent | c87b7705a0207798b3dc9168f4e91ebbe21f08a7 (diff) | |
| download | frameworks_base-30cca6020df6fede4043a9f6715be470d3132c57.zip frameworks_base-30cca6020df6fede4043a9f6715be470d3132c57.tar.gz frameworks_base-30cca6020df6fede4043a9f6715be470d3132c57.tar.bz2 | |
Merge "Fix contentInvalidateAll NPE"
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 2aa481c..4748522 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -9124,7 +9124,9 @@ public class WebView extends AbsoluteLayout /** @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 */ |