summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-17 17:48:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-17 17:48:58 -0700
commit7788c51d82963a8645655675c675424db694ad85 (patch)
treebd5b8aadddf8e4f2799f7ae9225ae6422d89b6ed /core/java
parentf129988a1aa8a210dc125b0f427d848a2aeb8bb2 (diff)
parent23a446cf270b1df8fe0e013a4328cd6b0ed9dde1 (diff)
downloadframeworks_base-7788c51d82963a8645655675c675424db694ad85.zip
frameworks_base-7788c51d82963a8645655675c675424db694ad85.tar.gz
frameworks_base-7788c51d82963a8645655675c675424db694ad85.tar.bz2
Merge "Fix onFirstLayout path for saved pages" into ics-mr0
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 48615bd..6e81530 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1917,6 +1917,7 @@ public class WebView extends AbsoluteLayout
mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this);
mBlockWebkitViewMessages = true;
setNewPicture(mLoadedPicture, true);
+ mLoadedPicture.mViewState = null;
return true;
} catch (IOException e) {
Log.w(LOGTAG, "Failed to loadViewState", e);
@@ -4355,7 +4356,9 @@ public class WebView extends AbsoluteLayout
selectionDone();
}
mOrientation = newConfig.orientation;
- mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
+ if (mWebViewCore != null && !mBlockWebkitViewMessages) {
+ mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
+ }
}
/**