commit a51c9b28c69aca6311cb7665372f8f25cd91d2f0
author Hai Shalom <haishalom@google.com> Wed May 13 19:00:56 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 13 19:00:56 2020 +0000
tree 4b0c1f1d5ca3f5eb16e61512c809828a8919ff60
parent 423c189d586569bbbb5355b853d085275ac335a9
parent 3c67dc05ccdebef908fa5fa762264ea3c9a91324

[WifiInstaller] Remove Passpoint profile before installing am: 3c67dc05cc

Change-Id: Ica7be6b4417f298b22f934445d8c388b7e0c8a2a

src/com/android/certinstaller/WiFiInstaller.java

diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java
index 90b8eb7..41827f6 100644
--- a/src/com/android/certinstaller/WiFiInstaller.java
+++ b/src/com/android/certinstaller/WiFiInstaller.java
@@ -93,6 +93,13 @@
                         public void run() {
                             boolean success = true;
                             try {
+                                mWifiManager.removePasspointConfiguration(
+                                        mPasspointConfig.getHomeSp().getFqdn());
+                            } catch (IllegalArgumentException e) {
+                                // Do nothing. This is expected if a profile with this FQDN does not
+                                // exist.
+                            }
+                            try {
                                 mWifiManager.addOrUpdatePasspointConfiguration(mPasspointConfig);
                             } catch (RuntimeException rte) {
                                 Log.w(TAG, "Caught exception while installing wifi config: " +