Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly handle infinite start time

Browse Source 
BUG: 34837854
Test: ag/1901799
Change-Id: If60dc9432df189642e67ff544e14a4cda7d5e0ec
This commit is contained in:
Doris Liu
2017-02-10 17:48:17 -08:00
parent dd65ab0407
commit c9b5034178
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/animation/AnimatorSet.java
View File

@@ -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;
}