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

am: c5848718ee

Change-Id: I05bf08cbd3231c5c6579c3a1949c24e0cccfd446
This commit is contained in:
Peter Qiu
2017-03-02 16:59:23 +00:00
committed by android-build-merger

View File

@@ -841,6 +841,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);
} }