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

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

Merge "Correctly handle infinite start time"

parents 4d20ee8c c9b50341

core/java/android/animation/AnimatorSet.java

+2 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,8 @@ 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.mAnimation.getStartDelay();

                return mNode.mStartTime = mNode.mStartTime == DURATION_INFINITE

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

            } else {

                return mNode.mEndTime;

            }