summaryrefslogtreecommitdiff
path: root/chromium/java/com/android/webview
diff options
context:
space:
mode:
authorIgnacio Solla <igsolla@google.com>2014-10-28 16:41:55 +0000
committerIgnacio Solla Paula <igsolla@google.com>2014-10-28 19:09:51 +0000
commit0c24beba16b0d27ff66ebbd5d8757a60d87ecd67 (patch)
tree0e81c491dac815cc8c9f7e0de05227ff16ab894d /chromium/java/com/android/webview
parent89b33e2103cee15b08a31a48b379b846bc690891 (diff)
downloadwebview-0c24beba16b0d27ff66ebbd5d8757a60d87ecd67.tar.gz
[WebView] Remove dependency on WEBVIEW_DATA_REDUCTION_PROXY.
BUG:18152150 Change-Id: Ie1f09273de1f18bdd587020cd77f914e727af9c9
Diffstat (limited to 'chromium/java/com/android/webview')
-rw-r--r--chromium/java/com/android/webview/chromium/DataReductionProxyManager.java8
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.