Merge "[conflict resolution] Merge "WM : Add a visibility test in waitForEnterPip." into android13-tests-dev am: f473f21" into android14-tests-dev

Mateusz Cicheński · Gerrit Code Review · commit 79fcd7b9a841 · 2023-11-14T05:46:08.000Z
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -1917,7 +1917,8 @@ private void waitForEnterPip(ComponentName activityName) {
         mWmState.waitForWithAmState(wmState -> {
             Task task = wmState.getTaskByActivity(activityName);
             return task != null
-                    && task.getActivity(activityName).getWindowingMode() == WINDOWING_MODE_PINNED;
+                    && task.getActivity(activityName).getWindowingMode() == WINDOWING_MODE_PINNED
+                    && task.isVisible();
         }, "checking task windowing mode");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1917,7 +1917,8 @@ private void waitForEnterPip(ComponentName activityName) {`
`1917`	`1917`	`mWmState.waitForWithAmState(wmState -> {`
`1918`	`1918`	`Task task = wmState.getTaskByActivity(activityName);`
`1919`	`1919`	`return task != null`
`1920`		`- && task.getActivity(activityName).getWindowingMode() == WINDOWING_MODE_PINNED;`
	`1920`	`+ && task.getActivity(activityName).getWindowingMode() == WINDOWING_MODE_PINNED`
	`1921`	`+ && task.isVisible();`
`1921`	`1922`	`}, "checking task windowing mode");`
`1922`	`1923`	`}`
`1923`	`1924`