Merge "Call wifiStatusTracker.fetchInitialState first" into main

2024-07-30 07:09:34 +00:00
parent d5225c236d 0be6705da6
commit 3a8ce3f970
1 changed files with 9 additions and 3 deletions
--- a/src/com/android/settings/wifi/repository/WifiStatusRepository.kt
+++ b/src/com/android/settings/wifi/repository/WifiStatusRepository.kt
@@ -50,14 +50,20 @@ class WifiStatusRepository(
                var wifiStatusTracker: WifiStatusTracker? = null
                wifiStatusTracker = wifiStatusTrackerFactory { wifiStatusTracker?.let(::trySend) }

+                // Fetches initial state first, before set listening to true, otherwise could cause
+                // race condition.
+                wifiStatusTracker.fetchInitialState()
+                trySend(wifiStatusTracker)
+
                context
                    .broadcastReceiverFlow(INTENT_FILTER)
-                    .onEach { intent -> wifiStatusTracker.handleBroadcast(intent) }
+                    .onEach { intent ->
+                        wifiStatusTracker.handleBroadcast(intent)
+                        trySend(wifiStatusTracker)
+                    }
                    .launchIn(this)

                wifiStatusTracker.setListening(true)
-                wifiStatusTracker.fetchInitialState()
-                trySend(wifiStatusTracker)

                awaitClose { wifiStatusTracker.setListening(false) }
            }