commit ab355380f0919d44ea0a04915a7dce9a7fab137d
author Kristian Monsen <kristianm@google.com> Mon Apr 12 12:07:30 2010 +0100
committer Kristian Monsen <kristianm@google.com> Mon Apr 12 12:07:30 2010 +0100
tree fc57101b3350ff0e835d65ae77729bae67ac2fa3
parent c58b42327df5fbc826e2fcc2674ab6db0edfcd92

Fix (again) for bug 2558156, update cache encoding correctly

My fault, the last fix did not fix the issue completly. Now setting the listener so the cache item can be found when the encoding is to be set by the background worker.

Change-Id: Iea514ada9b4f52760033daee66aa29cdceda1c9e

core/java/android/webkit/LoadListener.java

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 @@
             }
             WebViewWorker.CacheEncoding ce = new WebViewWorker.CacheEncoding();
             ce.mEncoding = mEncoding;
+            ce.mListener = this;
             WebViewWorker.getHandler().obtainMessage(
                     WebViewWorker.MSG_UPDATE_CACHE_ENCODING, ce).sendToTarget();
         }