Merge "Fix start time modification outside of updatePlayTime()"

2017-02-14 20:08:19 +00:00
parent 4114a9597a e8a5d8d211
commit 1740f1f1f1
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -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;