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

Commit 898a9950 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Support onBeforeUserSwitching in UserTracker.Callback" into main

parents 2c2859bb b37f9cc6

packages/SystemUI/src/com/android/systemui/settings/UserTracker.kt

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ interface UserTracker : UserContentResolverProvider, UserContextProvider { 
     */

    @WeaklyReferencedCallback

    interface Callback {

        /**

         * Notifies that the current user will be changed.

         */

        fun onBeforeUserSwitching(newUser: Int) {}



        /**

         * Same as {@link onUserChanging(Int, Context, Runnable)} but the callback will be

packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt

+7 −0
Original line number Diff line number Diff line
@@ -227,6 +227,13 @@ open class UserTrackerImpl internal constructor( 
    protected open fun handleBeforeUserSwitching(newUserId: Int) {

        Assert.isNotMainThread()

        setUserIdInternal(newUserId)



        val list = synchronized(callbacks) {

            callbacks.toList()

        }

        list.forEach {

            it.callback.get()?.onBeforeUserSwitching(newUserId)

        }

    }



    @WorkerThread

packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeUserTracker.kt

+6 −0
Original line number Diff line number Diff line
@@ -69,10 +69,16 @@ class FakeUserTracker( 
        _userId = _userInfo.id

        _userHandle = UserHandle.of(_userId)



        onBeforeUserSwitching()

        onUserChanging()

        onUserChanged()

    }



    fun onBeforeUserSwitching(userId: Int = _userId) {

        val copy = callbacks.toList()

        copy.forEach { it.onBeforeUserSwitching(userId) }

    }



    fun onUserChanging(userId: Int = _userId) {

        val copy = callbacks.toList()

        copy.forEach { it.onUserChanging(userId, userContext) {} }