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

Commit 7cb99687 authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

Fix UserRepository to use the correct callback method. 

Bug: 369294724
Bug: 331853529
Bug: 360838273

Change-Id: I8b412400b89f5c62ccfc314d49dad68400cb3e5b
Test: atest UserRepositoryImplTest
Flag: EXEMPT bugfix
parent fc8f7c21

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

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ constructor( 


                val callback =

                    object : UserTracker.Callback {

                        override fun onUserChanging(newUser: Int, userContext: Context) {

                        override fun onBeforeUserSwitching(newUser: Int) {

                            send(SelectionStatus.SELECTION_IN_PROGRESS)

                        }

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

+9 −1
Original line number Diff line number Diff line
@@ -248,10 +248,17 @@ class UserRepositoryImplTest : SysuiTestCase() { 


            setUpUsers(count = 2, selectedIndex = 1)



            // WHEN the user switch is starting

            tracker.onBeforeUserSwitching(userId = 1)



            // THEN the selection status is IN_PROGRESS

            assertThat(selectedUser!!.selectionStatus)

                .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS)



            // WHEN the user is changing

            tracker.onUserChanging(userId = 1)



            // THEN the selection status is IN_PROGRESS

            // THEN the selection status is still IN_PROGRESS

            assertThat(selectedUser!!.selectionStatus)

                .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS)
@@ -266,6 +273,7 @@ class UserRepositoryImplTest : SysuiTestCase() { 


            setUpUsers(count = 2, selectedIndex = 0)



            tracker.onBeforeUserSwitching(userId = 0)

            tracker.onUserChanging(userId = 0)

            assertThat(selectedUser!!.selectionStatus)

                .isEqualTo(SelectionStatus.SELECTION_IN_PROGRESS)