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

Commit f27cf9cb authored by Doris Liu's avatar Doris Liu Committed by android-build-merger
Browse files

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

am: 33f89320

Change-Id: I991ba78a570021ea4d7e7ac4d743225ee947a635
parents 97497985 33f89320

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