From ed811d731d211636b8617fb934e02d730a0039f8 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Fri, 6 May 2016 08:41:19 -0700
Subject: [PATCH] Fixed bad focus stack state when focused docked stack is
 removed

ag/990438 allowed for stack focus not to be adjusted when the currently
focused stack is removed since the caller will be moving the focus to
the right stack next. This was incorrectly enabled for the positionTask
call were the stack will not be moved to the front since the functionality
is used to move task within stacks we don't want to gain focus.

Bug: 28616824
Change-Id: Ia6aea17c0335d036a17b83fed28799428ca58eda
---
 services/core/java/com/android/server/am/ActivityStack.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 009c9a8caa552..dac710d759bd3 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -5065,7 +5065,7 @@ final class ActivityStack {
     void positionTask(final TaskRecord task, int position) {
         final ActivityRecord topRunningActivity = task.topRunningActivityLocked();
         final boolean wasResumed = topRunningActivity == task.stack.mResumedActivity;
-        final ActivityStack prevStack = preAddTask(task, "positionTask", ON_TOP);
+        final ActivityStack prevStack = preAddTask(task, "positionTask", !ON_TOP);
         task.stack = this;
         insertTaskAtPosition(task, position);
         postAddTask(task, prevStack);