diff options
| author | Mateusz Cicheński <mateuszc@google.com> | 2023-11-03 18:36:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-03 18:36:20 +0000 |
| commit | af5713e1dea6cda9182d63d144cd3357210cca16 (patch) | |
| tree | ec928518c8d3e2600b7a4382c2c5c4355727be75 | |
| parent | f3d03307950976bda0d1af8c7544263379a174d2 (diff) | |
| parent | 10cc03a40593109f1376d0513eda816c0b2ae844 (diff) | |
| download | cts-android12-dev.tar.gz | |
Merge "WM : Add a visibility test in waitForEnterPip." into android12-devandroid12-dev
| -rw-r--r-- | tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 aa17c5e6b4a..d7857847a03 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java @@ -1515,7 +1515,8 @@ public class PinnedStackTests extends ActivityManagerTestBase { private void waitForEnterPip(ComponentName activityName) { mWmState.waitForWithAmState(wmState -> { ActivityTask task = wmState.getTaskByActivity(activityName); - return task != null && task.getWindowingMode() == WINDOWING_MODE_PINNED; + return task != null && task.getWindowingMode() == WINDOWING_MODE_PINNED + && task.isVisible(); }, "checking task windowing mode"); } |