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

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

Fix start time modification outside of updatePlayTime() 

BUG: 35340235
Test: manually start the chrome photos app, no crash
      and CTS at: ag/1908702

Change-Id: I3c0a6f140ee497020b562f25cade241dcd993c2a
parent 492a058d

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;