Merge "Remove workaround for end() not supported in some app" into oc-dev

2017-04-03 21:41:12 +00:00
parent c0c524af4f ae570c04c0
commit 33f893202d
1 changed files with 4 additions and 6 deletions
--- 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