Merge "Update the current user again after registering UserChangeListener" into main (4a2e7e3a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+9 −1

Original line number	Diff line number	Diff line
		@@ -306,6 +306,8 @@ class DesktopTasksController(
		this,
		)
		shellController.addUserChangeListener(this)
		// Update the current user id again because it might be updated between init and onInit().
		updateCurrentUser(ActivityManager.getCurrentUser())
		transitions.addHandler(this)
		dragToDesktopTransitionHandler.dragToDesktopStateListener = dragToDesktopStateListener
		recentsTransitionHandler.addTransitionStateListener(
		@@ -3547,10 +3549,16 @@ class DesktopTasksController(
		// TODO(b/366397912): Support full multi-user mode in Windowing.
		override fun onUserChanged(newUserId: Int, userContext: Context) {
		logV("onUserChanged previousUserId=%d, newUserId=%d", userId, newUserId)
		updateCurrentUser(newUserId)
		}

		private fun updateCurrentUser(newUserId: Int) {
		userId = newUserId
		taskRepository = userRepositories.getProfile(userId)
		if (this::snapEventHandler.isInitialized) {
		snapEventHandler.onUserChange()
		}
		}

		/** Called when a task's info changes. */
		fun onTaskInfoChanged(taskInfo: RunningTaskInfo) {