diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 712b19e740b..2287cdab9e1 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -101,6 +101,13 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment if (!mWifiManager.hasCarrierConfiguredNetworks()){ removePreference(KEY_CONNECT_CARRIER_NETWORKS); + } else { + SwitchPreference connectToCarrierNetworks = + (SwitchPreference) findPreference(KEY_CONNECT_CARRIER_NETWORKS); + if (connectToCarrierNetworks != null) { + connectToCarrierNetworks.setChecked(Settings.Global.getInt(getContentResolver(), + Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS, 0) == 1); + } } SwitchPreference notifyOpenNetworks = @@ -109,11 +116,6 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); - SwitchPreference connectToCarrierNetworks = - (SwitchPreference) findPreference(KEY_CONNECT_CARRIER_NETWORKS); - connectToCarrierNetworks.setChecked(Settings.Global.getInt(getContentResolver(), - Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS, 0) == 1); - final Context context = getActivity(); if (avoidBadWifiConfig()) { // Hide preference toggle, always avoid bad wifi networks.