commit 3a8ce3f970ad2e66c39d06fdfd8550e588a48fb3
author Chaohui Wang <chaohuiw@google.com> Tue Jul 30 07:09:34 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 07:09:34 2024 +0000
tree ccb42484b65879fd9d7f7fbab51670fae3caadb6
parent d5225c236d765f414656262700e79c39722634a0
parent 0be6705da6e53efb6a74a9433de656ab20a435a6

Merge "Call wifiStatusTracker.fetchInitialState first" into main

src/com/android/settings/wifi/repository/WifiStatusRepository.kt

diff --git a/src/com/android/settings/wifi/repository/WifiStatusRepository.kt b/src/com/android/settings/wifi/repository/WifiStatusRepository.kt
index f97ed49..fe4ba6c 100644
--- a/src/com/android/settings/wifi/repository/WifiStatusRepository.kt
+++ b/src/com/android/settings/wifi/repository/WifiStatusRepository.kt
@@ -50,14 +50,20 @@
                 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) }
             }