commit | 6fb047a878a348b9fe333631fb68f23a384099c7 | [log] [tgz] |
---|---|---|
author | Marcin Kosiba <mkosiba@google.com> | Fri Oct 10 17:19:17 2014 +0100 |
committer | Marcin Kosiba <mkosiba@google.com> | Mon Oct 13 16:10:02 2014 +0000 |
tree | 2d6d4f0036b486be867379c655887d9c38f1b2cc | |
parent | 39781a2ada7233e0427844f4b7eef39170696bc5 [diff] |
Match removal of config_webSettingsDefaultTextEncoding. This is to match http://ag/565166 which removes the resource. Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906 (cherry picked from commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e)
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 3dd4155..ad2a26d 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -311,8 +311,6 @@ 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); }