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

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

Merge "Fix start time modification outside of updatePlayTime()"

parents 4114a959 e8a5d8d2

core/java/android/animation/AnimatorSet.java

+1 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
            if (mEvent == ANIMATION_START) {

                return mNode.mStartTime;

            } else if (mEvent == ANIMATION_DELAY_ENDED) {

                return mNode.mStartTime = mNode.mStartTime == DURATION_INFINITE

                return mNode.mStartTime == DURATION_INFINITE

                        ? DURATION_INFINITE : mNode.mStartTime + mNode.mAnimation.getStartDelay();

            } else {

                return mNode.mEndTime;