Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c493d079 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Don't explicitly wait for starting-window during tests with... 

Merge "Don't explicitly wait for starting-window during tests with shell-transitions" into sc-v2-dev am: ed7cdd6d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15718087

Change-Id: I04071d026e0f6095bac3c312b99f4942ef5f7208
parents b2fc9a7e ed7cdd6d

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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;