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

Commit 764c8ab6 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Launch the home task as user. 

Since there can be multiple home activites for different users, we
should use the correct userId to launch the home activity. This way wm
can pick the correct activity show in the home task.

Fix: 391455493
Test: manual, repro steps in bug
Flag: EXEMPT Bug fix
Change-Id: Ib5dd469bd4d5a6ec801dde51637e02d3b3a2bdd0
parent 8dd4d541

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

+5 −2
Original line number Diff line number Diff line
@@ -1446,6 +1446,7 @@ class DesktopTasksController( 
    }



    private fun addLaunchHomePendingIntent(wct: WindowContainerTransaction, displayId: Int) {

        val userHandle = UserHandle.of(userId)

        val launchHomeIntent =

            Intent(Intent.ACTION_MAIN).apply {

                if (displayId != DEFAULT_DISPLAY) {
@@ -1461,11 +1462,13 @@ class DesktopTasksController( 
                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS

            }

        val pendingIntent =

            PendingIntent.getActivity(

            PendingIntent.getActivityAsUser(

                context,

                /* requestCode= */ 0,

                launchHomeIntent,

                PendingIntent.FLAG_IMMUTABLE,

                /* options= */ null,

                userHandle,

            )

        wct.sendPendingIntent(pendingIntent, launchHomeIntent, options.toBundle())

    }