commit d200e9e7a507055ad5bccf976b109e95b2e42aaf
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 18 07:17:33 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 18 07:17:33 2020 +0000
tree ff480a7acac17d85768a429d421462c9ba45106a
parent 1d1a4c85694de3a7f0763b6227bb477e5799fa2f
parent a395e426307706075c2a625c4c6b9f93a643c3f9

Merge "Import translations. DO NOT MERGE" into rvc-dev

src/com/android/certinstaller/CertInstallerMain.java

diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java
index 0b37953..4cec5fc 100644
--- a/src/com/android/certinstaller/CertInstallerMain.java
+++ b/src/com/android/certinstaller/CertInstallerMain.java
@@ -77,7 +77,8 @@
         setResult(RESULT_CANCELED);
 
         UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
-        if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)
+                || userManager.isGuestUser()) {
             finish();
             return;
         }

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: " +