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 @@ - - UTF-8 - 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 @@ - -