From 3d32af264254660150c5f2d63a64b3462a9378dd Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Wed, 3 Jun 2015 14:16:13 -0700
Subject: [PATCH] Fix Wifi Settings crash on continuous wifi toggling.

Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
---
 src/com/android/settings/wifi/WifiSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 0dee191ee9d..6b9fc2f1447 100644
--- 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()));