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

Commit 6e72ff90 authored by Patrick Dubroy's avatar Patrick Dubroy Committed by Android (Google) Code Review
Browse files

Merge "Fix latent bug with reinitializing an ObjectAnimator." into honeycomb

parents d7398953 7beecfaf

core/java/android/animation/ObjectAnimator.java

+2 −1
Original line number Diff line number Diff line
@@ -340,8 +340,9 @@ public final class ObjectAnimator extends ValueAnimator { 
    @Override

    public void setTarget(Object target) {

        if (mTarget != target) {

            final Object oldTarget = mTarget;

            mTarget = target;

            if (mTarget  != null && target != null && mTarget.getClass() == target.getClass()) {

            if (oldTarget != null && target != null && oldTarget.getClass() == target.getClass()) {

                return;

            }

            // New target type should cause re-initialization prior to starting