From d08127fff184bdf465d36cb7f6c906a4a96669de Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 1 Apr 2010 17:04:27 +0100
Subject: [PATCH] Fix for bug 2558156: Encodig is null

This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
---
 core/java/android/webkit/LoadListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 1dfaddec2896b..1130e950780eb 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -474,6 +474,7 @@ class LoadListener extends Handler implements EventHandler {
                         WebViewWorker.MSG_CREATE_CACHE, data).sendToTarget();
             }
             WebViewWorker.CacheEncoding ce = new WebViewWorker.CacheEncoding();
+            ce.mEncoding = mEncoding;
             WebViewWorker.getHandler().obtainMessage(
                     WebViewWorker.MSG_UPDATE_CACHE_ENCODING, ce).sendToTarget();
         }