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

Commit c9b50341 authored by Doris Liu's avatar Doris Liu
Browse files

Correctly handle infinite start time 

BUG: 34837854
Test: ag/1901799
Change-Id: If60dc9432df189642e67ff544e14a4cda7d5e0ec
parent dd65ab04

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;

            }