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

Commit 0dad5cba authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Wait enough time for WMS#waitForAnimationsToComplete" into sc-dev am:... 

Merge "Wait enough time for WMS#waitForAnimationsToComplete" into sc-dev am: 127ea4fa am: 42d38d8e am: b4a6b325

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

Change-Id: I18546992e3d92a86b02f9e30365f4397b8fcb3a3
parents 6033a8a6 b4a6b325

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

+7 −5
Original line number Diff line number Diff line
@@ -8108,11 +8108,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            // This could prevent if there is no container animation, we still have to apply the

            // pending transaction and exit waiting.

            mAnimator.mNotifyWhenNoAnimation = true;

            WindowContainer animatingContainer = null;

            while (mAnimator.isAnimationScheduled() || timeoutRemaining > 0) {

                animatingContainer = mRoot.getAnimatingContainer(TRANSITION | CHILDREN,

                        ANIMATION_TYPE_ALL);

                if (animatingContainer == null) {

            while (timeoutRemaining > 0) {

                boolean isAnimating = mAnimator.isAnimationScheduled()

                        || mRoot.isAnimating(TRANSITION | CHILDREN, ANIMATION_TYPE_ALL);

                if (!isAnimating) {

                    break;

                }

                long startTime = System.currentTimeMillis();
@@ -8124,6 +8123,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

            mAnimator.mNotifyWhenNoAnimation = false;



            WindowContainer animatingContainer;

            animatingContainer = mRoot.getAnimatingContainer(TRANSITION | CHILDREN,

                    ANIMATION_TYPE_ALL);

            if (mAnimator.isAnimationScheduled() || animatingContainer != null) {

                Slog.w(TAG, "Timed out waiting for animations to complete,"

                        + " animatingContainer=" + animatingContainer