From 4ec020a4242fe392aa3be0a465d55414e1b164fa Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Wed, 1 Mar 2017 09:07:34 -0800 Subject: [PATCH] wifi: use Passpoint API when forgetting a Passpoint network Use WifiManager#removePasspointConfiguration when forgetting a Passpoint network to remove the configuration. This maintains the legacy behavior, where forgetting a Passpoint network/AP will remove its provider's profile. Bug: 34207710 Test: manual test Change-Id: I8b7f6d9fb20fa9f0f0d90566f76c2a39308ce420 --- src/com/android/settings/wifi/WifiSettings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7007d19e710..9d0d55616f2 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -840,6 +840,8 @@ public class WifiSettings extends RestrictedSettingsFragment Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig()); return; } + } else if (mSelectedAccessPoint.getConfig().isPasspoint()) { + mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN); } else { mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener); }