summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-08-31 18:43:48 -0700
committerGrace Kloba <klobag@google.com>2009-08-31 18:43:48 -0700
commitef32ee3db8c1c48894ce62cd8e151d7fa8501c86 (patch)
tree038c16a41976d3edea36b0ad215171c0c559439d /core/java
parent0f44220b34e346ef333cdb4cd4b4903b5212dad2 (diff)
downloadframeworks_base-ef32ee3db8c1c48894ce62cd8e151d7fa8501c86.zip
frameworks_base-ef32ee3db8c1c48894ce62cd8e151d7fa8501c86.tar.gz
frameworks_base-ef32ee3db8c1c48894ce62cd8e151d7fa8501c86.tar.bz2
When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/LoadListener.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 43c76a8..1a5b2eb 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -606,6 +606,7 @@ class LoadListener extends Handler implements EventHandler {
// before calling it.
if (mCacheLoader != null) {
mCacheLoader.load();
+ mFromCache = true;
if (DebugFlags.LOAD_LISTENER) {
Log.v(LOGTAG, "LoadListener cache load url=" + url());
}