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

Commit 46a91b6e authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix animator sometimes not being ended when end() is called without start()'ing"

parents 33de9248 66d48566

core/java/android/animation/ValueAnimator.java

+2 −1
Original line number Diff line number Diff line
@@ -955,7 +955,6 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio 
        mStarted = true;

        mPaused = false;

        mRunning = false;

        mAnimationEndRequested = false;

        AnimationHandler animationHandler = AnimationHandler.getInstance();

        animationHandler.addAnimationFrameCallback(this, (long) (mStartDelay * sDurationScale));
@@ -1123,6 +1122,8 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio 
            Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, getNameForTrace(),

                    System.identityHashCode(this));

        }



        mAnimationEndRequested = false;

        initAnimation();

        mRunning = true;

        if (mSeekFraction >= 0) {