diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-25 16:48:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-25 16:48:38 +0000 |
| commit | 81e094d76b9220e335edc24599919f8cd0f5d317 (patch) | |
| tree | bcac9bcfb0ed81ac829d7b5042ac4b6a5e3000dc /services/java | |
| parent | 8907801268b62dfadaf8c9f73d60ffaea6dbf904 (diff) | |
| parent | 97024321fcff3427e4e1cc6ced9b6abc7525fdb0 (diff) | |
| download | frameworks_base-81e094d76b9220e335edc24599919f8cd0f5d317.zip frameworks_base-81e094d76b9220e335edc24599919f8cd0f5d317.tar.gz frameworks_base-81e094d76b9220e335edc24599919f8cd0f5d317.tar.bz2 | |
Merge "Move task to top in window manager." into klp-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index 62e1340..d616f1b 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -1709,6 +1709,7 @@ public final class ActivityStackSupervisor { TaskRecord sourceTask = sourceRecord.task; targetStack = sourceTask.stack; moveHomeStack(targetStack.isHomeStack()); + mWindowManager.moveTaskToTop(sourceTask.taskId); if (!addingToTask && (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { // In this case, we are adding the activity to an existing @@ -1767,6 +1768,7 @@ public final class ActivityStackSupervisor { r.setTask(prev != null ? prev.task : targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true), null, true); + mWindowManager.moveTaskToTop(r.task.taskId); if (DEBUG_TASKS) Slog.v(TAG, "Starting new activity " + r + " in new guessed " + r.task); } |