diff options
| author | Ignacio Solla <igsolla@google.com> | 2014-10-28 16:41:55 +0000 |
|---|---|---|
| committer | Ignacio Solla Paula <igsolla@google.com> | 2014-10-31 11:59:40 +0000 |
| commit | 9665d9d05901196bbcf6f0de9dff5c2bc3d99750 (patch) | |
| tree | 57698b81a70fa8c5af3c3dadae7d57c7b7e7f511 /chromium/java/com/android/webview | |
| parent | b60534d5e551871dc3724de4ed1da98b2cc5bee3 (diff) | |
| download | webview-9665d9d05901196bbcf6f0de9dff5c2bc3d99750.tar.gz | |
Cherry-pick: [WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.
BUG:18152150
Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9
(cherry picked from commit 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67)
Diffstat (limited to 'chromium/java/com/android/webview')
| -rw-r--r-- | chromium/java/com/android/webview/chromium/DataReductionProxyManager.java | 8 |
1 files changed, 1 insertions, 7 deletions
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. |