commit dd221b3780800f03900c52bfc4a1ac7d01b72bc2
author Craig Mautner <cmautner@google.com> Wed Mar 19 19:53:45 2014 -0700
committer Craig Mautner <cmautner@google.com> Wed Mar 19 19:53:45 2014 -0700
tree c872fddbac1a3d5353825814371d14a640a567f9
parent 95e9daab03d0349a69940625c7f718175f371581

Fix oversight when checking in last CL

Too much was deleted due to the order of operations while
debugging. CL 435015 removed some critical lines.

Fixes bug 13410184.

Change-Id: Ia1fbf985d73163742c4c531e8505606454897f69

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 09ec4f6..9783a66 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1776,6 +1776,7 @@
                 return ActivityManager.START_RETURN_LOCK_TASK_MODE_VIOLATION;
             }
             targetStack = sourceTask.stack;
+            targetStack.moveToFront();
             mWindowManager.moveTaskToTop(sourceTask.taskId);
             if (!addingToTask &&
                     (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
@@ -1827,6 +1828,7 @@
             // of a new task...  just put it in the top task, though these days
             // this case should never happen.
             targetStack = adjustStackFocus(r);
+            targetStack.moveToFront();
             ActivityRecord prev = targetStack.topActivity();
             r.setTask(prev != null ? prev.task
                     : targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true),