commit adce1145a98f7c7f9cb279551f307f1c547f4267
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 10 07:18:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 10 07:18:42 2017 +0000
tree 63735321aa38b56ff644a1ff3bd75308a5b3801a
parent ef2b35ad591156d3e18c6b9a5a240ed325dec02a
parent 5d8d883ab14f8d2c5edfce8fefb646ae40f7dd40

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

src/com/android/settings/wifi/ConfigureWifiSettings.java

diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 712b19e..2287cda 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -101,6 +101,13 @@
 
         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 @@
                 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.