Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix no guest visible while on multi user switcher" into tm-qpr-dev am: 95799ff292 am: 95b8f5b764

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

Change-Id: I7b58c5470cdf74777cab331fc4b30ee276537d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Hinegardner
2022-12-02 02:14:54 +00:00
committed by Automerger Merge Worker
parent a2c4b4f77d 95b8f5b764
commit f562c96ad2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/user/domain/interactor/UserInteractor.kt
View File

@@ -114,9 +114,9 @@ constructor(
private val callbackMutex = Mutex()
private val callbacks = mutableSetOf<UserCallback>()
private val userInfos =
combine(repository.userSwitcherSettings, repository.userInfos) { settings, userInfos ->
userInfos.filter { !it.isGuest || canCreateGuestUser(settings) }.filter { it.isFull }
private val userInfos: Flow<List<UserInfo>> =
repository.userInfos.map { userInfos ->
userInfos.filter { it.isFull }
}
/** List of current on-device users to select from. */

6
packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt
View File

@@ -761,7 +761,7 @@ class UserInteractorTest : SysuiTestCase() {
}
@Test
fun `users - secondary user - no guest user`() =
fun `users - secondary user - guest user can be switched to`() =
runBlocking(IMMEDIATE) {
val userInfos = createUserInfos(count = 3, includeGuest = true)
userRepository.setUserInfos(userInfos)
@@ -770,8 +770,8 @@ class UserInteractorTest : SysuiTestCase() {
var res: List<UserModel>? = null
val job = underTest.users.onEach { res = it }.launchIn(this)
assertThat(res?.size == 2).isTrue()
assertThat(res?.find { it.isGuest }).isNull()
assertThat(res?.size == 3).isTrue()
assertThat(res?.find { it.isGuest }).isNotNull()
job.cancel()
}