Merge "RESTRICT AUTOMERGE Set launch root for split app orientation request test" into android12-tests-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
index b6671b8438e..043d12b9ce1 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
@@ -831,7 +831,7 @@ public class AppConfigurationTests extends MultiDisplayTestBase {
         // Launch activities in split screen.
         launchActivitiesInSplitScreen(
                 getLaunchActivityBuilder().setTargetActivity(LAUNCHING_ACTIVITY),
-                getLaunchActivityBuilder().setTargetActivity(activity).setMultipleTask(true));
+                getLaunchActivityBuilder().setTargetActivity(activity));
         mWmState.assertVisibility(activity, true /* visible */);
 
         // Rotate the device and it should always rotate regardless orientation app requested.
@@ -839,6 +839,8 @@ public class AppConfigurationTests extends MultiDisplayTestBase {
         assertEquals("Split-screen apps shouldn't influence device orientation",
                 rotation, mWmState.getRotation());
 
+        // Launch target activity during split-screen again and check orientation still not change.
+        mTaskOrganizer.setLaunchRoot(mTaskOrganizer.getSecondarySplitTaskId());
         getLaunchActivityBuilder().setMultipleTask(true).setTargetActivity(activity).execute();
         mWmState.computeState(activity);
         mWmState.assertVisibility(activity, true /* visible */);