Fix Wifi Settings crash on continuous wifi toggling.

Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 0dee191..6b9fc2f 100644 (file)
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -816,7 +816,8 @@ public class WifiSettings extends RestrictedSettingsFragment
     /* package */ void forget() {
         MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
         if (!mSelectedAccessPoint.isSaved()) {
-            if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
+            if (mSelectedAccessPoint.getNetworkInfo() != null &&
+                    mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
                 // Network is active but has no network ID - must be ephemeral.
                 mWifiManager.disableEphemeralNetwork(
                         AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid()));