Fix issue that Wifi Wake is not enabled in boot sequence

For instance, at first time boot, if user unlock comes in before
loading from store, the read operation to stores doesn't happen.
This leads to the issue that Wifi Wake is not enabled because
WakeupConfigStoreData#hasBeenRead method returns false.
To handle this situation, this patch is to trigger read operation
even if there is nothing in the store so that all the store data
clients are informed that store data has been read.

Bug: 120189688
Test: Unit tests
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
Change-Id: If999b97abda115a956a268726f08019e02d5f46c

1 files changed, 1 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index a145fde47..e78d177fb 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2945,12 +2945,7 @@ public class WifiConfigManager {
             mWifiConfigStore.setUserStores(WifiConfigStore.createUserFiles(mCurrentUserId));
             mDeferredUserUnlockRead = false;
         }
-        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;
-            }
+        if (mWifiConfigStoreLegacy.areStoresPresent()) {
             return true;
         }
         try {