summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2013-08-05 16:14:22 -0700
committer Craig Mautner <cmautner@google.com> 2013-08-05 16:14:22 -0700
commitf140fd9cef0ad2a522ad0edd852f763003933338 (patch)
tree3a97fb573266fca497f51ad9f906be5d7665e34c
parentf239d9d7bb15fbdbe026835d5ee6b0c91d3ac5f0 (diff)
Clear last paused activity.
Moving an activity to the back used to move it behind the launcher. This meant that the test in resumeTopActivityLocked() for mLastPausedActivity being equal to the top activity would fail after moveTaskToBack(). In the new activity stack model the launcher is on a different stack so if there is only one task then the test now passes. Clearing mLastPausedActivity when moving an activity forward now passes the test. Fixes bug 10022212. Change-Id: I17932d5c87d2483f13c29ae85a7067202a08f34e
-rw-r--r--services/java/com/android/server/am/ActivityStack.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index dd71044b3754..cc1be98e589b 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2949,6 +2949,7 @@ final class ActivityStack {
mWindowManager.moveTaskToTop(tr.taskId);
+ mLastPausedActivity = null;
mStackSupervisor.resumeTopActivitiesLocked();
EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.userId, tr.taskId);