commit 0230a59dd73301ca3e7a386b3d04ea13c0e89129
author John Reck <jreck@google.com> Thu Sep 01 13:51:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 01 13:51:58 2011 -0700
tree f1774d0864915dd663a145728b9de5747a061ef8
parent aa0a7cbf2fc5311a3246ed875418f9c639307a9e
parent f9fa8be5e37b47d01ae37afb08f68428072e4aa3

am f9fa8be5: Merge "Prevent serialization after being destroyed"

* commit 'f9fa8be5e37b47d01ae37afb08f68428072e4aa3':
  Prevent serialization after being destroyed

core/java/android/webkit/ViewStateSerializer.java

diff --git a/core/java/android/webkit/ViewStateSerializer.java b/core/java/android/webkit/ViewStateSerializer.java
index 0fc76fa..5f91ed3 100644
--- a/core/java/android/webkit/ViewStateSerializer.java
+++ b/core/java/android/webkit/ViewStateSerializer.java
@@ -36,11 +36,15 @@
 
     static boolean serializeViewState(OutputStream stream, WebView web)
             throws IOException {
+        int baseLayer = web.getBaseLayer();
+        if (baseLayer == 0) {
+            return false;
+        }
         DataOutputStream dos = new DataOutputStream(stream);
         dos.writeInt(VERSION);
         dos.writeInt(web.getContentWidth());
         dos.writeInt(web.getContentHeight());
-        return nativeSerializeViewState(web.getBaseLayer(), dos,
+        return nativeSerializeViewState(baseLayer, dos,
                 new byte[WORKING_STREAM_STORAGE]);
     }
 

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 673db8c..2e7f923 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4308,6 +4308,9 @@
     }
 
     int getBaseLayer() {
+        if (mNativeClass == 0) {
+            return 0;
+        }
         return nativeGetBaseLayer();
     }