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

Commit abc44d09 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Don't move home task forward in some cases. 

Don't move the home task forward if we are starting an activity from
recent in split-screen mode since recents should still be visible in
this case.

Change-Id: I5b2e37c3644983f6feb08c09a10d15d7aa2bc45a
Fixes: 68489631
Test: go/wm-smoke
Test: Steps from bug.
parent 92c9a948

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+6 −3
Original line number Diff line number Diff line
@@ -4489,9 +4489,12 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                        "startActivityFromRecents: Task " + taskId + " not found.");

            }



            // We always want to return to the home activity instead of the recents activity from

            // whatever is started from the recents activity, so move the home stack forward.

            if (windowingMode != WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) {

                // We always want to return to the home activity instead of the recents activity

                // from whatever is started from the recents activity, so move the home stack

                // forward.

                moveHomeStackToFront("startActivityFromRecents");

            }



            // If the user must confirm credentials (e.g. when first launching a work app and the

            // Work Challenge is present) let startActivityInPackage handle the intercepting.