From 2c0789b8f82ae2ac2b1713a62098e87f4adb6d3c Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Mon, 30 Aug 2021 12:12:11 -0700
Subject: [PATCH] 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
---
 .../java/com/android/server/wm/WindowManagerService.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 43b555c914bcc..4f3c6d5b6b5f6 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -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;