Merge "Add shell command to move activity stacks between displays"

diff --cc services/core/java/com/android/server/wm/DisplayContent.java
index 5d55ac7,450ed20..ec4cdf2
--- 1/services/core/java/com/android/server/wm/DisplayContent.java
--- 2/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@@ -3109,9 -3145,13 +3178,13 @@@ class DisplayContent extends WindowCont
       * Window container class that contains all containers on this display relating to Apps.
       * I.e Activities.
       */
 -    private class TaskStackContainers extends DisplayChildWindowContainer<TaskStack> {
 +    private final class TaskStackContainers extends DisplayChildWindowContainer<TaskStack> {
  
-         void attachStack(TaskStack stack, boolean onTop) {
+         /**
+          * Adds the stack to this container.
+          * @see WindowManagerService#addStackToDisplay(int, int, boolean)
+          */
+         void addStackToDisplay(TaskStack stack, boolean onTop) {
              if (stack.mStackId == HOME_STACK_ID) {
                  if (mHomeStack != null) {
                      throw new IllegalArgumentException("attachStack: HOME_STACK_ID (0) not first.");

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge