From 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67 Mon Sep 17 00:00:00 2001 From: Ignacio Solla Date: Tue, 28 Oct 2014 16:41:55 +0000 Subject: [WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY. BUG:18152150 Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9 --- .../com/android/webview/chromium/DataReductionProxyManager.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'chromium') diff --git a/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java b/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java index 32006bf..aafd41e 100644 --- a/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java +++ b/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java @@ -170,14 +170,8 @@ public final class DataReductionProxyManager { } private static boolean isDataReductionProxyEnabled(Context context) { - boolean enabled = getProxySetting(context.getContentResolver(), + return getProxySetting(context.getContentResolver(), WEBVIEW_DATA_REDUCTION_PROXY) != 0; - // intentional fallback. remove before L release. - if (!enabled) { - enabled = Settings.Secure.getInt(context.getContentResolver(), - Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0; - } - return enabled; } // Read query setting from GoogleSettings. -- cgit v1.2.3