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

Commit 14e9a662 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add more logs in WindowManagerService#waitForAnimationsToComplete" into... 

Merge "Add more logs in WindowManagerService#waitForAnimationsToComplete" into sc-dev am: dacdc6a7 am: 49041bfc

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

Change-Id: Ib0b08498f67c02d241bc319a70210c4619a141dd
parents ee406166 49041bfc

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

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ class SurfaceAnimator { 
    /**

     * Converts {@link AnimationType} to String.

     */

    private static String animationTypeToString(@AnimationType int type) {

    static String animationTypeToString(@AnimationType int type) {

        switch (type) {

            case ANIMATION_TYPE_NONE: return "none";

            case ANIMATION_TYPE_APP_TRANSITION: return "app_transition";

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

+15 −5
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ import static com.android.server.wm.ActivityTaskManagerService.POWER_MODE_REASON 
import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL;

import static com.android.server.wm.DisplayContent.IME_TARGET_INPUT;

import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;

import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -8090,8 +8091,13 @@ 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;

            while ((mAnimator.isAnimationScheduled()

                    || mRoot.isAnimating(TRANSITION | CHILDREN)) && timeoutRemaining > 0) {

            WindowContainer animatingContainer = null;

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

                animatingContainer = mRoot.getAnimatingContainer(TRANSITION | CHILDREN,

                        ANIMATION_TYPE_ALL);

                if (animatingContainer == null) {

                    break;

                }

                long startTime = System.currentTimeMillis();

                try {

                    mGlobalLock.wait(timeoutRemaining);
@@ -8101,9 +8107,13 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

            mAnimator.mNotifyWhenNoAnimation = false;



            if (mAnimator.isAnimationScheduled()

                    || mRoot.isAnimating(TRANSITION | CHILDREN)) {

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

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

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

                        + " animatingContainer=" + animatingContainer

                        + " animationType=" + SurfaceAnimator.animationTypeToString(

                        animatingContainer != null

                                ? animatingContainer.mSurfaceAnimator.getAnimationType()

                                : SurfaceAnimator.ANIMATION_TYPE_NONE));

            }

        }

    }