commit d49c2ff80f65a31d8b4b0448ef3fa2977e4dff44
author Peter Qiu <zqiu@google.com> Thu Mar 02 16:59:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 02 16:59:23 2017 +0000
tree bfdda54553933172cb1899ca3285078e9c52b309
parent b09610a3dcb5ff375687b5892153bc8c26583c3d
parent c5848718ee132f64d43a2e94ba44bf017e5ad886

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

Change-Id: I05bf08cbd3231c5c6579c3a1949c24e0cccfd446

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1d07f6c..4456172 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -841,6 +841,8 @@
                 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);
         }