Merge "Ignore invalid network forget" into jb-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3408163152
@@ -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()) {
|
||||||
|
Reference in New Issue
Block a user