commit 3bf0fb1a909f167dc7356d3b584dc0cb27f086d0
author Craig Mautner <cmautner@google.com> Thu Mar 20 02:56:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 20 02:56:05 2014 +0000
tree 039ad680bd54b4992b1ef2c92d5b668bbc0fa2aa
parent dbd60a71b5d7ac55a91ccd938121e133e17ed0cb
parent dd221b3780800f03900c52bfc4a1ac7d01b72bc2

Merge "Fix oversight when checking in last CL"

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),