From ef2b35ad591156d3e18c6b9a5a240ed325dec02a Mon Sep 17 00:00:00 2001
From: pkanwar <pkanwar@google.com>
Date: Mon, 9 Jan 2017 12:21:22 -0800
Subject: [PATCH] DO NOT MERGE: Fix NPE in ConfigureWifiSettings.

NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.

Bug: 34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
---
 .../android/settings/wifi/ConfigureWifiSettings.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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.