From 48afff27a297943ff90c13a4f3bd34557ec1e735 Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Mon, 16 Jun 2014 16:45:53 -0700 Subject: [PATCH] Do not enable bandwidth reduction settings if key is not available Bug: 15607413 If bandwidth reduction settings are enabled when a key is not ready yet, webview network connections stall due to a bug in M36 of chrome. Do not let it enabled via settings app. Change-Id: I7dc80c33f72ab59de68f919ef227d5227e6b923d --- src/com/android/settings/DevelopmentSettings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 02045ab585..87b1f32b4e 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -358,6 +358,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mAllPrefs.add(mProcessStats); mWebViewDataReductionProxy = findAndInitCheckboxPref(WEBVIEW_DATA_REDUCTION_PROXY_KEY); + String key = Settings.Global.getString(getActivity().getContentResolver(), + Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY); + // Make it not selectable if the key is not available for some reason. + mWebViewDataReductionProxy.setSelectable(key != null && !key.isEmpty()); } private ListPreference addListPreference(String prefKey) { @@ -1250,8 +1254,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWebViewDataReductionProxyOptions() { updateCheckBox(mWebViewDataReductionProxy, Settings.Secure.getInt( - getActivity().getContentResolver(), - Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0); + getActivity().getContentResolver(), + Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0); } @Override -- 2.11.0