Merge "Return Job in collectLatestWithLifecycle" into main (bcc59ec1) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/Flows.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.LifecycleOwner
		import androidx.lifecycle.lifecycleScope
		import androidx.lifecycle.repeatOnLifecycle
		import kotlinx.coroutines.Job
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.collectLatest
		import kotlinx.coroutines.flow.combine
		@@ -61,10 +62,8 @@ fun <T> Flow<T>.collectLatestWithLifecycle(
		lifecycleOwner: LifecycleOwner,
		minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
		action: suspend (value: T) -> Unit,
		) {
		lifecycleOwner.lifecycleScope.launch {
		): Job = lifecycleOwner.lifecycleScope.launch {
		lifecycleOwner.repeatOnLifecycle(minActiveState) {
		collectLatest(action)
		}
		}
		}