Ignore invalid network forget

Bug: 6397063
Change-Id: I066bd45e95b7e8671bc7dfcb83e46246f110b3a9

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index f369d35..d0af893 100644 (file)
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -777,6 +777,12 @@ public class WifiSettings extends SettingsPreferenceFragment
     }
 
     /* package */ void forget() {
+        if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
+            // Should not happen, but a monkey seems to triger it
+            Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
+            return;
+        }
+
         mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {