Merge "Handled exeption in forget() for removePasspointConfiguration()"

This commit is contained in:
Quang Luong
2019-02-28 20:22:36 +00:00
committed by Android (Google) Code Review

View File

@@ -1116,7 +1116,12 @@ public class WifiSettings extends RestrictedSettingsFragment
return; return;
} }
} else if (mSelectedAccessPoint.getConfig().isPasspoint()) { } else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN); try {
mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
} catch (IllegalArgumentException e) {
Log.e(TAG, "Failed to remove Passpoint configuration with error: " + e);
return;
}
} else { } else {
mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener); mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
} }