diff options
| author | 2022-10-31 21:39:51 +0000 | |
|---|---|---|
| committer | 2022-10-31 21:39:51 +0000 | |
| commit | 1c0583799353572925a0acd71a60c6840d3e7159 (patch) | |
| tree | ebc74510e34f777fb15a4f8ae8aaaa1cc91263ed | |
| parent | 8de9bc9888a80d5da2830089e5bc7276b29bf5bd (diff) | |
| parent | a0d7be3a018f11aacc8f4a7e7398fa041aeb3089 (diff) | |
Merge "Blind fix for user switcher instant crash." into tm-qpr-dev am: a0d7be3a01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20328972
Change-Id: Ia9ff867f65878b5ffa25eedd00e92154071ac835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt index b16dc5403a57..6a2326036ec0 100644 --- a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt @@ -62,6 +62,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext /** @@ -136,7 +137,7 @@ constructor( private val isNewImpl: Boolean get() = !featureFlags.isEnabled(Flags.USER_INTERACTOR_AND_REPO_USE_CONTROLLER) - private val _userSwitcherSettings = MutableStateFlow<UserSwitcherSettingsModel?>(null) + private val _userSwitcherSettings = MutableStateFlow(runBlocking { getSettings() }) override val userSwitcherSettings: Flow<UserSwitcherSettingsModel> = _userSwitcherSettings.asStateFlow().filterNotNull() @@ -235,7 +236,7 @@ constructor( } override fun isSimpleUserSwitcher(): Boolean { - return checkNotNull(_userSwitcherSettings.value?.isSimpleUserSwitcher) + return _userSwitcherSettings.value.isSimpleUserSwitcher } private fun observeSelectedUser() { |