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

Commit 1e0897e2 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 am: c493d079

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

Change-Id: Id7b64bf8ae9b2a18b3fcb10e367e47c293bf19df
parents 4a9d5765 c493d079

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

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