diff options
| author | nadlabak <pavel@doshaska.net> | 2016-05-13 15:33:34 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-17 16:38:17 -0700 |
| commit | 3a532e7d448a78500448956ec52ff24f835f9733 (patch) | |
| tree | dc53cee26bf624d9c2d7a4f443248fb09206ce7b /src/com/android/settings/wifi | |
| parent | d67600a4f39917e47d5009bf4f9f8ce3be362af9 (diff) | |
| download | packages_apps_Settings-3a532e7d448a78500448956ec52ff24f835f9733.zip packages_apps_Settings-3a532e7d448a78500448956ec52ff24f835f9733.tar.gz packages_apps_Settings-3a532e7d448a78500448956ec52ff24f835f9733.tar.bz2 | |
Revert "wifi: forward port avoid poor connection setting"
This reverts commit d77990f4cccd4fdc4bd479305ae6c2419d2f8610.
Change-Id: I0987d8eb9e8e6c7730f0576f174b61115973d5fb
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/AdvancedWifiSettings.java | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index 7aaaa90..b933a28 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -60,7 +60,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment private static final String KEY_COUNTRY_CODE = "wifi_countrycode"; private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks"; private static final String KEY_SLEEP_POLICY = "sleep_policy"; - private static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection"; private static final String KEY_INSTALL_CREDENTIALS = "install_credentials"; private static final String KEY_WIFI_ASSISTANT = "wifi_assistant"; private static final String KEY_WIFI_DIRECT = "wifi_direct"; @@ -135,19 +134,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); - SwitchPreference poorNetworkDetection = - (SwitchPreference) findPreference(KEY_POOR_NETWORK_DETECTION); - if (poorNetworkDetection != null) { - if (Utils.isWifiOnly(getActivity())) { - getPreferenceScreen().removePreference(poorNetworkDetection); - } else { - poorNetworkDetection.setChecked(Settings.Global.getInt(getContentResolver(), - Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, - WifiManager.DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED ? - 1 : 0) == 1); - } - } - Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION); intent.setClassName("com.android.certinstaller", "com.android.certinstaller.CertInstallerMain"); @@ -289,10 +275,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment Global.putInt(getContentResolver(), Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, ((SwitchPreference) preference).isChecked() ? 1 : 0); - } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) { - Global.putInt(getContentResolver(), - Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, - ((SwitchPreference) preference).isChecked() ? 1 : 0); } else { return super.onPreferenceTreeClick(screen, preference); } |