summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Kosiba <mkosiba@google.com>2014-10-10 17:19:17 +0100
committerMarcin Kosiba <mkosiba@google.com>2014-10-13 09:39:53 +0000
commite494d2acb563ed232164c819857b341286be7c6e (patch)
tree4a0ac48e967a70e31b5a450203832f95a8851512
parent22fec495f2e36255d15ff35301ad96d5f7e35d20 (diff)
downloadandroid_frameworks_webview-e494d2acb563ed232164c819857b341286be7c6e.tar.gz
android_frameworks_webview-e494d2acb563ed232164c819857b341286be7c6e.tar.bz2
android_frameworks_webview-e494d2acb563ed232164c819857b341286be7c6e.zip
Match removal of config_webSettingsDefaultTextEncoding.
This is to match http://ag/565166 which removes the resource. Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906 (cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 5a947e8..1b10971 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -303,8 +303,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
AwResource.setResources(ctx.getResources());
AwResource.setErrorPageResources(android.R.raw.loaderror,
android.R.raw.nodomain);
- AwResource.setDefaultTextEncoding(
- android.R.string.config_webSettingsDefaultTextEncoding);
AwResource.setConfigKeySystemUuidMapping(
android.R.array.config_keySystemUuidMapping);
}