commit 7f4b4202130620edf385b7544e1358c589ee69d2
author Craig Mautner <cmautner@google.com> Wed Jul 16 15:42:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 15 20:36:09 2014 +0000
tree 669aa97ed72fdb451b202fab591a072259803d3c
parent f9c79c63bc6630888785b7acdd8332b08e87a18b
parent d937616f87563db83cb607040965104a9fad66ef

Merge "[ActivityManager] Move top task to top in window manager"

services/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index d616f1b..cc9df76 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1709,7 +1709,7 @@
             TaskRecord sourceTask = sourceRecord.task;
             targetStack = sourceTask.stack;
             moveHomeStack(targetStack.isHomeStack());
-            mWindowManager.moveTaskToTop(sourceTask.taskId);
+            mWindowManager.moveTaskToTop(targetStack.topTask().taskId);
             if (!addingToTask &&
                     (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
                 // In this case, we are adding the activity to an existing