Merge "Correctly handle infinite start time"

2017-02-13 23:39:50 +00:00
parent 4d20ee8c46 c9b5034178
commit 2bf869e97c
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -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;
            }