From ae570c04c0e43e0d66e2c563fe6d8cacb438961b Mon Sep 17 00:00:00 2001 From: Doris Liu Date: Mon, 3 Apr 2017 11:08:11 -0700 Subject: [PATCH] Remove workaround for end() not supported in some app BUG: 36241584 Test: Follow repro steps of comment #1 in the bug above Change-Id: I1bf27a7cc9cc2bd398c372623d7978e838f1d8b2 --- core/java/android/animation/AnimatorSet.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 5c7a12cf5eb93..fe496e3989886 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