Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae570c04 authored by Doris Liu's avatar Doris Liu
Browse files

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
parent 38344ac4

core/java/android/animation/AnimatorSet.java

+4 −6
Original line number Diff line number Diff line
@@ -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