Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 96cfad5d: check for null before calling native webkit from java webview

Browse Source 
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp

* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
  check for null before calling native webkit from java webview
This commit is contained in:
Cary Clark
2009-09-25 09:14:27 -07:00
committed by Android Git Automerger
parent 7e74262ab6 96cfad5d67
commit 6fb27c5a68
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebViewCore.java
View File

@@ -1650,12 +1650,14 @@ final class WebViewCore {
} }
/* package */ synchronized boolean pictureReady() { /* package */ synchronized boolean pictureReady() {
return nativePictureReady(); return 0 != mNativeClass ? nativePictureReady() : false;
} }
/*package*/ synchronized Picture copyContentPicture() { /*package*/ synchronized Picture copyContentPicture() {
Picture result = new Picture(); Picture result = new Picture();
nativeCopyContentToPicture(result); if (0 != mNativeClass) {
nativeCopyContentToPicture(result);
}
return result; return result;
} }