Don't explicitly wait for starting-window during tests with shell-transitions

Starting-window is part of sync-set when using shell-transitions,
so don't wait for it separately in waitForAnimationsToComplete because
it will just time-out.

Bug: 183993924
Test: atest WindowUntrustedTouchTests
Change-Id: I4788148dab3e6b957a7d37dee01587b904d46e48
This commit is contained in:
Evan Rosky
2021-08-30 12:12:11 -07:00
parent 81b968f843
commit 2c0789b8f8

View File

@@ -8111,9 +8111,8 @@ public class WindowManagerService extends IWindowManager.Stub
boolean animateStarting = false;
while (timeoutRemaining > 0) {
// Waiting until all starting windows has finished animating.
animateStarting = mRoot.forAllActivities(a -> {
return a.hasStartingWindow();
});
animateStarting = !mAtmService.getTransitionController().isShellTransitionsEnabled()
&& mRoot.forAllActivities(ActivityRecord::hasStartingWindow);
boolean isAnimating = mAnimator.isAnimationScheduled()
|| mRoot.isAnimating(TRANSITION | CHILDREN, ANIMATION_TYPE_ALL)
|| animateStarting;