PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3408163152d055f4ff59b027e72b662e710e72aa':
  Ignore invalid network forget
This commit is contained in:
Irfan Sheriff
2012-04-27 16:47:25 -07:00
committed by Android Git Automerger
parent 4f38f99996 3408163152
commit 8d626e3e0e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -777,6 +777,12 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
/* package */ void forget() { /* 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); mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
if (mWifiManager.isWifiEnabled()) { if (mWifiManager.isWifiEnabled()) {