commit 91342ee58aba7fc6fef814a5b8d3e3c9dedb3ccc
author Austin Borger <borgera@google.com> Thu Dec 02 20:02:43 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 02 20:02:43 2021 +0000
tree 82643b6e46c3c010f8b4d63c5d89f5984c2231c5
parent f76e1b49d66677291a47d484cc82bcd2f399625e
parent 175a1324c90d1ce79b58bc1f07a257f1189de868

Merge "CtsVerifier / Camera format test: Fix warnings from checkstyle.py" into sc-v2-dev

tests/framework/base/windowmanager/util/src/android/server/wm/TestTaskOrganizer.java

diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/TestTaskOrganizer.java b/tests/framework/base/windowmanager/util/src/android/server/wm/TestTaskOrganizer.java
index f357a7d..ab02d3d 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/TestTaskOrganizer.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/TestTaskOrganizer.java
@@ -130,7 +130,8 @@
 
             // Set the roots as adjacent to each other.
             final WindowContainerTransaction wct = new WindowContainerTransaction();
-            wct.setAdjacentRoots(mRootPrimary.getToken(), mRootSecondary.getToken());
+            wct.setAdjacentRoots(mRootPrimary.getToken(), mRootSecondary.getToken(),
+                    true /* moveTogether */);
             applyTransaction(wct);
         }
     }