diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-14 12:10:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 12:10:47 -0700 |
| commit | 11d60e0b33d1b581b418e3ceee99e2377244b2fb (patch) | |
| tree | b40ec7e48443a8b134356476ddaea8da0b29a7a7 /core | |
| parent | 31a17033dcb3551e2964aa6b89041ad9b0317015 (diff) | |
| parent | 3e360000fcb1cc60d8786d1340f9a468014c6435 (diff) | |
| download | frameworks_base-11d60e0b33d1b581b418e3ceee99e2377244b2fb.zip frameworks_base-11d60e0b33d1b581b418e3ceee99e2377244b2fb.tar.gz frameworks_base-11d60e0b33d1b581b418e3ceee99e2377244b2fb.tar.bz2 | |
am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken
* commit '3e360000fcb1cc60d8786d1340f9a468014c6435':
Fix (again) for bug 2558156, update cache encoding correctly
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/LoadListener.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index 12b8c74..e0f8bc0 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -476,6 +476,7 @@ class LoadListener extends Handler implements EventHandler { } WebViewWorker.CacheEncoding ce = new WebViewWorker.CacheEncoding(); ce.mEncoding = mEncoding; + ce.mListener = this; WebViewWorker.getHandler().obtainMessage( WebViewWorker.MSG_UPDATE_CACHE_ENCODING, ce).sendToTarget(); } |