Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c058379 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Blind fix for user switcher instant crash." into tm-qpr-dev am: a0d7be3a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20328972



Change-Id: Ia9ff867f65878b5ffa25eedd00e92154071ac835
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8de9bc98 a0d7be3a

packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt

+3 −2
Original line number Diff line number Diff line
@@ -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() {