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

Commit e1f23848 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Postpone destroying leash until after cancel callback."

parents 88f53c23 4a2d3741

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

+7 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ class SurfaceAnimator { 
        if (DEBUG_ANIM) Slog.i(TAG, "Cancelling animation restarting=" + restarting);

        final SurfaceControl leash = mLeash;

        final AnimationAdapter animation = mAnimation;

        reset(t, forwardCancel);

        reset(t, false);

        if (animation != null) {

            if (!mAnimationStartDelayed && forwardCancel) {

                animation.onAnimationCancelled(leash);
@@ -260,6 +260,12 @@ class SurfaceAnimator { 
                mAnimationFinishedCallback.run();

            }

        }



        if (forwardCancel && leash != null) {

            t.remove(leash);

            mService.scheduleAnimationLocked();

        }



        if (!restarting) {

            mAnimationStartDelayed = false;

        }