diff options
| author | Ignacio Solla <igsolla@google.com> | 2014-10-31 11:59:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 11:59:06 +0000 |
| commit | b12c873f72ec666570321ac817e2eae1e01e1ab7 (patch) | |
| tree | 27690f04988399232353eebc9c080dd5ff0284f8 /chromium | |
| parent | a77ae8970e35025840112942522e4521716c5422 (diff) | |
| parent | 0c24beba16b0d27ff66ebbd5d8757a60d87ecd67 (diff) | |
| download | webview-b12c873f72ec666570321ac817e2eae1e01e1ab7.tar.gz | |
Merge "[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY." into master-chromium
Diffstat (limited to 'chromium')
| -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. |