am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack"

* commit '93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2': Only one task within the stack should moveToBack
2014-12-10 21:57:22 +00:00
parent cf3e91f5c2 93c5cf6a6f
commit 38b5d057f0
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -191,7 +191,9 @@ public class TaskStack {
        mTasks.add(stackNdx, task);

        task.mStack = this;
-        mDisplayContent.moveStack(this, true);
+        if (toTop) {
+            mDisplayContent.moveStack(this, true);
+        }
        EventLog.writeEvent(EventLogTags.WM_TASK_MOVED, task.taskId, toTop ? 1 : 0, stackNdx);
    }