WifiConfigManager: Handle user switch after fresh install

Need to handle user switch after a fresh install. Since, there are no
store files after a fresh install, we need to reset the
|mPendingStoreRead| flag to allow user switch handling.

Bug: 34834491
Test: Added unit test
Change-Id: I097ea506c2e536413feab89182d03826829eabce

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 17110f319..7d8893e0f 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2555,6 +2555,10 @@ public class WifiConfigManager {
     public boolean loadFromStore() {
         if (!mWifiConfigStore.areStoresPresent()) {
             Log.d(TAG, "New store files not found. No saved networks loaded!");
+            if (!mWifiConfigStoreLegacy.areStoresPresent()) {
+                // No legacy store files either, so reset the pending store read flag.
+                mPendingStoreRead = false;
+            }
             return true;
         }
         WifiConfigStoreData storeData;