diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 1b552b5375e7..8c07e01d1163 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4406,7 +4406,7 @@ final class ActivityStack { mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID); if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) { final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity(); - mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack"); + mService.setFocusedActivityLocked(visibleBehind, "moveHomeTaskToBack"); mStackSupervisor.resumeFocusedStackTopActivityLocked(); return true; } @@ -4459,9 +4459,11 @@ final class ActivityStack { } final int taskToReturnTo = tr.getTaskToReturnTo(); tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); - return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, "moveTaskToBack"); + return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, + "moveTaskToBackAndShowHome"); } + adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack"); mStackSupervisor.resumeFocusedStackTopActivityLocked(); return true; } |