Merge changes I601bc725,I1bd0ab91 am: 855a7a989b am: b64809ddac

am: 182bebc352

Change-Id: Ib2d19a29f8262c9f02ef6f996ae3b91e8c832f82

1 files changed, 18 insertions, 15 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index b21ff0647..5de7e99d2 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2463,21 +2463,22 @@ public class WifiConfigManager {
      */
     public void resetSimNetworks(boolean simPresent) {
         if (mVerboseLoggingEnabled) localLog("resetSimNetworks");
-        for (WifiConfiguration config : getInternalConfiguredNetworks()) {
-            if (TelephonyUtil.isSimConfig(config)) {
-                Pair<String, String> currentIdentity = null;
-                if (simPresent) {
-                    currentIdentity = TelephonyUtil.getSimIdentity(mTelephonyManager,
-                        new TelephonyUtil(), config);
-                }
-                // Update the loaded config
-                if (currentIdentity == null) {
-                    Log.d(TAG, "Identity is null");
-                    return;
-                }
-                config.enterpriseConfig.setIdentity(currentIdentity.first);
-                if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) {
-                    config.enterpriseConfig.setAnonymousIdentity("");
+        if (simPresent) {
+            for (WifiConfiguration config : getInternalConfiguredNetworks()) {
+                if (TelephonyUtil.isSimConfig(config)) {
+                    Pair<String, String> currentIdentity =
+                            TelephonyUtil.getSimIdentity(mTelephonyManager,
+                                    new TelephonyUtil(), config);
+
+                    // Update the loaded config
+                    if (currentIdentity == null) {
+                        Log.d(TAG, "Identity is null");
+                        break;
+                    }
+                    config.enterpriseConfig.setIdentity(currentIdentity.first);
+                    if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) {
+                        config.enterpriseConfig.setAnonymousIdentity("");
+                    }
                 }
             }
         }
@@ -2719,6 +2720,8 @@ public class WifiConfigManager {
         if (mConfiguredNetworks.sizeForAllUsers() == 0) {
             Log.w(TAG, "No stored networks found.");
         }
+        // resetSimNetworks may already have been called. Call it again to reset loaded SIM configs.
+        resetSimNetworks(mSimPresent);
         sendConfiguredNetworksChangedBroadcast();
         mPendingStoreRead = false;
     }