commit b7fc96c2d26cf62420187e22280a7d0865e9be8a
author Pablo Gamito <pablogamito@google.com> Tue May 24 00:27:15 2022 +0000
committer Pablo Gamito <pablogamito@google.com> Fri May 27 11:17:13 2022 +0000
tree 7e0e14c70d93b428f4f17927b4f07b38322755e4
parent 0ccc215c4e5efde045c68490d8a58146d4a005ce

Update ActivityTransitionTests for shell transit

When shell transitions are enabled we don't dump a value for lastUsedAppTransition in the proto trace so getWmState().getDefaultDisplayLastTransition() always returns TRANSIT_NONE for 0.

Just checking the app transition state should be robust enough.

Test: atest CtsWindowManagerDeviceTestCases:ActivityTransitionTests with shell transitions enabled

Bug: 233597493
Change-Id: I2330f244c6cdc95c37627bfb8acb6ef3c1aa59e1

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

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
index f55cccf..cd005e5 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
@@ -457,9 +457,7 @@
         boolean isTransitioning;
         do {
             getWmState().computeState();
-            isTransitioning =
-                    getWmState().getDefaultDisplayLastTransition().equals("TRANSIT_ACTIVITY_OPEN")
-                    && getWmState().getDefaultDisplayAppTransitionState()
+            isTransitioning = getWmState().getDefaultDisplayAppTransitionState()
                             .equals("APP_STATE_RUNNING");
             SystemClock.sleep(10);
         } while (!isTransitioning);