commit 295e4c594bbeeb93ad0db22de10bd557afdaf458
author Jorge Gil <jorgegil@google.com> Tue May 17 18:30:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 18:30:46 2022 +0000
tree 6e7f596a97755e40705bfe1b15e52c82d75031da
parent 3609578994c674959752845d636d120716ab93aa
parent d97d08ee27b7019fb747de1ff7d4f6b55bd05577

Merge "Skip testAutoPipOnLaunchingActivityWithNoUserAction in freeform" into tm-dev

tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
index dbfe7e9..b05be36 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -1506,6 +1506,11 @@
         launchActivity(PIP_ACTIVITY, extraString(EXTRA_ALLOW_AUTO_PIP, "true"));
         assertPinnedStackDoesNotExist();
 
+        int windowingMode = mWmState.getTaskByActivity(PIP_ACTIVITY).getWindowingMode();
+        // Skip the test if freeform, since desktops may manually request PIP immediately after
+        // the test activity launch.
+        assumeFalse(windowingMode == WINDOWING_MODE_FREEFORM);
+
         // Launch a regular activity with FLAG_ACTIVITY_NO_USER_ACTION and
         // ensure that there is no pinned stack.
         launchActivityWithNoUserAction(TEST_ACTIVITY);