diff options
| -rw-r--r-- | core/java/android/animation/AnimatorSet.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 5c7a12cf5eb9..fe496e398988 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -431,12 +431,10 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim // Force all the animations to end when the duration scale is 0. private void forceToEnd() { - // TODO: Below is commented out to temp work around b/36241584, uncomment this when it's - // fixed. -// if (mEndCanBeCalled) { -// end(); -// return; -// } + if (mEndCanBeCalled) { + end(); + return; + } // Note: we don't want to combine this case with the end() method below because in // the case of developer calling end(), we still need to make sure end() is explicitly |