diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-03-06 14:13:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-06 14:13:54 -0800 |
| commit | b4827c089fc0aec49a73cc32cd18d2ce4d627c5a (patch) | |
| tree | 46911a134c8adff622a8203557d31e67960be2b0 /core/java | |
| parent | 957c800ac0cb8e375dc3d4c38011456d5c429f95 (diff) | |
| parent | 18e98863421d7596902d6c8d20b62af1ac4ef1da (diff) | |
| download | frameworks_base-b4827c089fc0aec49a73cc32cd18d2ce4d627c5a.zip frameworks_base-b4827c089fc0aec49a73cc32cd18d2ce4d627c5a.tar.gz frameworks_base-b4827c089fc0aec49a73cc32cd18d2ce4d627c5a.tar.bz2 | |
Merge "Pass the version down to native"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/ViewStateSerializer.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/webkit/ViewStateSerializer.java b/core/java/android/webkit/ViewStateSerializer.java index a22fc26..e672b62 100644 --- a/core/java/android/webkit/ViewStateSerializer.java +++ b/core/java/android/webkit/ViewStateSerializer.java @@ -52,12 +52,12 @@ class ViewStateSerializer { throws IOException { DataInputStream dis = new DataInputStream(stream); int version = dis.readInt(); - if (version != VERSION) { + if (version > VERSION) { throw new IOException("Unexpected version: " + version); } int contentWidth = dis.readInt(); int contentHeight = dis.readInt(); - int baseLayer = nativeDeserializeViewState(dis, + int baseLayer = nativeDeserializeViewState(version, dis, new byte[WORKING_STREAM_STORAGE]); final WebViewCore.DrawData draw = new WebViewCore.DrawData(); @@ -76,7 +76,7 @@ class ViewStateSerializer { OutputStream stream, byte[] storage); // Returns a pointer to the BaseLayer - private static native int nativeDeserializeViewState( + private static native int nativeDeserializeViewState(int version, InputStream stream, byte[] storage); private ViewStateSerializer() {} |