From fd1ac83f6339a608967ae478240f1ad6a0fa01ef Mon Sep 17 00:00:00 2001
From: Marcin Kosiba <mkosiba@google.com>
Date: Fri, 10 Oct 2014 17:12:49 +0100
Subject: [PATCH] Remove the default WebView text encoding resource entirely.

Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
---
 core/java/android/webkit/WebSettings.java | 3 ++-
 core/res/res/values/config.xml            | 3 ---
 core/res/res/values/public.xml            | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index db8fc6fb04ad7..7cf3cb5ad7ca1 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1355,9 +1355,10 @@ public abstract class WebSettings {
     public synchronized boolean getJavaScriptCanOpenWindowsAutomatically() {
         throw new MustOverrideException();
     }
+
     /**
      * Sets the default text encoding name to use when decoding html pages.
-     * The default is "Latin-1".
+     * The default is "UTF-8".
      *
      * @param encoding the text encoding name
      */
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 190d601eab407..2c3eb6905ca0a 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1776,9 +1776,6 @@
 
     <string-array translatable="false" name="config_cdma_home_system" />
 
-    <!-- Default text encoding for WebSettings. @hide @SystemApi -->
-    <string name="config_webSettingsDefaultTextEncoding">UTF-8</string>
-
     <!--From SmsMessage-->
     <!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
         string that's stored in 8-bit unpacked format) characters.-->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 8ebcd6d271302..7568252d912b4 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2545,8 +2545,6 @@
     <!-- @hide This really shouldn't be public; clients using it should use @* to ref it.  -->
     <public type="style" name="Theme.Leanback.FormWizard" id="0x010302d0" />
 
-    <public type="string" name="config_webSettingsDefaultTextEncoding" id="0x01040018" />
-
     <public type="array" name="config_keySystemUuidMapping" id="0x01070005" />
 
     <!-- An interpolator which accelerates fast but decelerates slowly. -->