am 34081631: Merge "Ignore invalid network forget" into jb-dev

* commit '3408163152d055f4ff59b027e72b662e710e72aa':
  Ignore invalid network forget

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()) {