Merge "Don't bring stack forward when moving tasks."

3 files changed, 0 insertions, 9 deletions

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 5e6bdb1ac7f1..2d7a171cddda 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2857,8 +2857,6 @@ final class ActivityStack {
             return;
         }
 
-        mStackSupervisor.moveHomeStack(isHomeStack());
-
         // Shift all activities with this task up to the top
         // of the stack, keeping them in the same internal order.
         mTaskHistory.remove(tr);
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index ba8de39f9b93..8224c88abb8e 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1911,10 +1911,6 @@ public final class ActivityStackSupervisor {
         }
         removeTask(task);
         stack.addTask(task, toTop);
-        if (toTop) {
-            moveHomeStack(stack.isHomeStack());
-            setFocusedStack(task.getTopActivity());
-        }
         mWindowManager.addTask(taskId, stackId, toTop);
         resumeTopActivitiesLocked();
     }
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 92ce102b4bf0..faeb37c69409 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -4855,9 +4855,6 @@ public class WindowManagerService extends IWindowManager.Stub
             TaskStack stack = mStackIdToStack.get(stackId);
             stack.addTask(task, toTop);
             final DisplayContent displayContent = stack.getDisplayContent();
-            if (toTop) {
-                displayContent.moveHomeStackBox(stack.isHomeStack());
-            }
             displayContent.layoutNeeded = true;
             performLayoutAndPlaceSurfacesLocked();
         }