diff options
| author | Cary Clark <cary@android.com> | 2009-09-25 10:16:06 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2009-09-25 12:06:20 -0400 |
| commit | 96cfad5d673b49d8b3a724d7b1066493aacd74d5 (patch) | |
| tree | 769e0b9510bb1b1180f275662ac18e7b507a7fcf | |
| parent | 82e62668d0d3e09f27629c7aff6425faacdfa7f8 (diff) | |
| download | frameworks_base-96cfad5d673b49d8b3a724d7b1066493aacd74d5.zip frameworks_base-96cfad5d673b49d8b3a724d7b1066493aacd74d5.tar.gz frameworks_base-96cfad5d673b49d8b3a724d7b1066493aacd74d5.tar.bz2 | |
check for null before calling native webkit from java webview
fixes http://b/issue?id=2121684
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 8b9ca57..53024d6 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1650,12 +1650,14 @@ final class WebViewCore { } /* package */ synchronized boolean pictureReady() { - return nativePictureReady(); + return 0 != mNativeClass ? nativePictureReady() : false; } /*package*/ synchronized Picture copyContentPicture() { Picture result = new Picture(); - nativeCopyContentToPicture(result); + if (0 != mNativeClass) { + nativeCopyContentToPicture(result); + } return result; } |