From 93346b558a5af6da11e764793e10bed70102b387 Mon Sep 17 00:00:00 2001 From: Alex Stetson Date: Wed, 5 Apr 2023 12:48:54 -0700 Subject: [PATCH] Allow beforeUserSwitch override Bug: 277094749 Test: manual Change-Id: I773a4f77be1e0bb0646c18778e1bad55cce8ab4d --- .../src/com/android/systemui/settings/UserTrackerImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt b/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt index 72286f175671b..3711a2f39b7bc 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt @@ -162,7 +162,7 @@ open class UserTrackerImpl internal constructor( private fun registerUserSwitchObserver() { iActivityManager.registerUserSwitchObserver(object : UserSwitchObserver() { override fun onBeforeUserSwitching(newUserId: Int) { - setUserIdInternal(newUserId) + handleBeforeUserSwitching(newUserId) } override fun onUserSwitching(newUserId: Int, reply: IRemoteCallback?) { @@ -180,6 +180,10 @@ open class UserTrackerImpl internal constructor( }, TAG) } + protected open fun handleBeforeUserSwitching(newUserId: Int) { + setUserIdInternal(newUserId) + } + @WorkerThread protected open fun handleUserSwitching(newUserId: Int) { Assert.isNotMainThread()