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

Commit 38e8fd54 authored by Nikhil Kumar's avatar Nikhil Kumar
Browse files

Add FLAG_FULL to mocked users in GuestUserInteractorTest 

Only Full users are allowed to switch to and run in foreground.
Added FLAG_FULL to the mocked users used in GuestUserInteractorTest.

Changed deprecated method supportsSwitchToByUser to supportsSwitchTo
in GuestUserInteractor.

Test: atest GuestUserInteractorTest -c
Bug: 268271623
Change-Id: I68f80cc7bf5b3487df2e5c0c73c7e0ef500ba74d
parent f6725955

packages/SystemUI/src/com/android/systemui/user/domain/interactor/GuestUserInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ constructor( 
                        withContext(backgroundDispatcher) {

                            manager.getUserInfo(lastSelectedNonGuestUserHandle)

                        }

                    if (info != null && info.isEnabled && info.supportsSwitchToByUser()) {

                    if (info != null && info.isEnabled && info.supportsSwitchTo()) {

                        newUserId = info.id

                    }

                }

packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/GuestUserInteractorTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -384,14 +384,14 @@ class GuestUserInteractorTest : SysuiTestCase() { 
            UserInfo(

                /* id= */ 818,

                /* name= */ "non_guest",

                /* flags= */ 0,

                /* flags= */ UserInfo.FLAG_FULL,

            )

        private val GUEST_USER_INFO =

            UserInfo(

                /* id= */ 669,

                /* name= */ "guest",

                /* iconPath= */ "",

                /* flags= */ 0,

                /* flags= */ UserInfo.FLAG_FULL,

                UserManager.USER_TYPE_FULL_GUEST,

            )

        private val EPHEMERAL_GUEST_USER_INFO =
@@ -399,7 +399,7 @@ class GuestUserInteractorTest : SysuiTestCase() { 
                /* id= */ 669,

                /* name= */ "guest",

                /* iconPath= */ "",

                /* flags= */ UserInfo.FLAG_EPHEMERAL,

                /* flags= */ UserInfo.FLAG_EPHEMERAL or UserInfo.FLAG_FULL,

                UserManager.USER_TYPE_FULL_GUEST,

            )

        private val ALL_USERS =