From 96cfad5d673b49d8b3a724d7b1066493aacd74d5 Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Fri, 25 Sep 2009 10:16:06 -0400
Subject: [PATCH] check for null before calling native webkit from java webview

fixes http://b/issue?id=2121684
---
 core/java/android/webkit/WebViewCore.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 8b9ca57d7ef4a..53024d69f40c7 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;
     }