diff options
| author | 2017-02-10 17:48:17 -0800 | |
|---|---|---|
| committer | 2017-02-10 18:07:55 -0800 | |
| commit | c9b5034178809a0c51f368735fded79bd73527bd (patch) | |
| tree | 12890fc6fcf369f7b70b1a1794f7ba0e9189e58c | |
| parent | dd65ab04071fd80007155e8cb4b205370acf759b (diff) | |
Correctly handle infinite start time
BUG: 34837854
Test: ag/1901799
Change-Id: If60dc9432df189642e67ff544e14a4cda7d5e0ec
| -rw-r--r-- | core/java/android/animation/AnimatorSet.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 2940e865b31b..78cd89bb14ca 100644 --- 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; } |