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

Merge "[User Switcher] Remove callback in onDestroy" into tm-dev

Browse Source
This commit is contained in:
Aaron Liu
2022-05-09 15:51:56 +00:00
committed by Android (Google) Code Review
parent 67382ffe5c bd0282a0d7
commit ebf92a1acb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt
View File

@@ -71,6 +71,11 @@ class UserSwitcherActivity @Inject constructor(
private var popupMenu: UserSwitcherPopupMenu? = null private var popupMenu: UserSwitcherPopupMenu? = null
private lateinit var addButton: View private lateinit var addButton: View
private var addUserRecords = mutableListOf<UserRecord>() private var addUserRecords = mutableListOf<UserRecord>()
private val userSwitchedCallback: UserTracker.Callback = object : UserTracker.Callback {
override fun onUserChanged(newUser: Int, userContext: Context) {
finish()
}
}
// When the add users options become available, insert another option to manage users // When the add users options become available, insert another option to manage users
private val manageUserRecord = UserRecord( private val manageUserRecord = UserRecord(
null /* info */, null /* info */,
@@ -215,11 +220,7 @@ class UserSwitcherActivity @Inject constructor(
initBroadcastReceiver() initBroadcastReceiver()
parent.post { buildUserViews() } parent.post { buildUserViews() }
userTracker.addCallback(object : UserTracker.Callback { userTracker.addCallback(userSwitchedCallback, mainExecutor)
override fun onUserChanged(newUser: Int, userContext: Context) {
finish()
}
}, mainExecutor)
} }
private fun showPopupMenu() { private fun showPopupMenu() {
@@ -340,6 +341,7 @@ class UserSwitcherActivity @Inject constructor(
super.onDestroy() super.onDestroy()
broadcastDispatcher.unregisterReceiver(broadcastReceiver) broadcastDispatcher.unregisterReceiver(broadcastReceiver)
userTracker.removeCallback(userSwitchedCallback)
} }
private fun initBroadcastReceiver() { private fun initBroadcastReceiver() {