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

Commit 807843d8 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Merge "Bring home to front behind assistant stack when needed." into... 

Merge "Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev am: 0a3684eb am: a58a7bf4" into oc-mr1-dev-plus-aosp
am: 5f57b53f

Change-Id: I7983d17469d772becd7f4698146f69a11378df70
parents 151a6551 5f57b53f

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

+9 −0
Original line number Diff line number Diff line
@@ -3382,6 +3382,15 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
            return mStackSupervisor.moveHomeStackTaskToTop(reason);

        }



        if (stack.isAssistantStack() && top != null

                && top.getTask().getTaskToReturnTo() == HOME_ACTIVITY_TYPE) {

            // It is possible for the home stack to not be directly underneath the assistant stack.

            // For example, the assistant may start an activity in the fullscreen stack. Upon

            // returning to the assistant stack, we must ensure that the home stack is underneath

            // when appropriate.

            mStackSupervisor.moveHomeStackTaskToTop("adjustAssistantReturnToHome");

        }



        stack.moveToFront(myReason);

        return true;

    }