diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index d75e6a968131..3620ddb74bab 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3424,6 +3424,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; } |