Merge "wifi: use Passpoint API when forgetting a Passpoint network" am: ff960ed859 am: c5848718ee

am: d49c2ff80f

Change-Id: I2ffbf8cccd698cc8bd5145a7896243ea35107518
This commit is contained in:
Peter Qiu
2017-03-02 17:01:27 +00:00
committed by android-build-merger

View File

@@ -954,6 +954,8 @@ public class WifiSettings extends RestrictedSettingsFragment
Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig()); Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
return; return;
} }
} else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
} else { } else {
mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener); mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
} }