diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/TaskRecord.java | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 58bdc280a3de..e683e9ed4572 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -462,7 +462,7 @@ public final class ActivityStackSupervisor implements DisplayListener { mHomeStack.moveHomeStackTaskToTop(homeStackTaskType); - final ActivityRecord top = mHomeStack.topRunningActivityLocked(null); + final ActivityRecord top = getHomeActivity(); if (top == null) { return false; } @@ -485,7 +485,8 @@ public final class ActivityStackSupervisor implements DisplayListener { prev.task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); } - ActivityRecord r = mHomeStack.topRunningActivityLocked(null); + mHomeStack.moveHomeStackTaskToTop(homeStackTaskType); + ActivityRecord r = getHomeActivity(); if (r != null) { mService.setFocusedActivityLocked(r, reason); return resumeTopActivitiesLocked(mHomeStack, prev, null); diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 790a78dcb17b..f3b451641a53 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -385,10 +385,8 @@ final class TaskRecord { } void setTaskToReturnTo(int taskToReturnTo) { - if (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE) { - taskToReturnTo = HOME_ACTIVITY_TYPE; - } - mTaskToReturnTo = taskToReturnTo; + mTaskToReturnTo = (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE) + ? HOME_ACTIVITY_TYPE : taskToReturnTo; } int getTaskToReturnTo() { |