Resetting SIM identity after store is read

Sometimes CMD_RESET_SIM_NETWORKS is received before CMD_BOOT_COMPLETED.
And then identity is not reset because stored data is not loaded yet in
this timing. Hence, framework requests connection with old identity.

This patch calls the method resetSimNetworksresets after store is read
to make sure identity is updated regardless of the order of events.

Bug: 113547031
Test: Manual
Test: run unit tests
Change-Id: I601bc725ab102867dbb5441617d3f4d76321a95f

1 files changed, 2 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index bbffdc827..c8c4844cc 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2733,6 +2733,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;
     }