From c27d9b5341b29c1b58c882f0a04b4c519d8a9853 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Mon, 25 May 2009 16:57:15 +0900
Subject: [PATCH] Manual merge from cupcake_dcm. internal CL#148693. Two
 donottranslate.xml-s are already submitted.

---
 core/java/android/webkit/WebSettings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 105eacdca7544..dcba94348a990 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -123,7 +123,7 @@ public class WebSettings {
     private String          mSerifFontFamily = "serif";
     private String          mCursiveFontFamily = "cursive";
     private String          mFantasyFontFamily = "fantasy";
-    private String          mDefaultTextEncoding = "Latin-1";
+    private String          mDefaultTextEncoding;
     private String          mUserAgent;
     private boolean         mUseDefaultUserAgent;
     private String          mAcceptLanguage;
@@ -240,6 +240,8 @@ public class WebSettings {
     WebSettings(Context context) {   
         mEventHandler = new EventHandler();
         mContext = context;
+        mDefaultTextEncoding = context.getString(com.android.internal.
+                                                 R.string.default_text_encoding);
 
         if (sLockForLocaleSettings == null) {
             sLockForLocaleSettings = new Object();