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

Commit a140391f authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev 

am: 6bb61e25

* commit '6bb61e25':
  Revert "Run cleanup before end actions of ViewPropertyAnimator."

Change-Id: I2254f4f2dfa19711fac8ed90e72addb94f4e26b8
parents f232f3cc 6bb61e25

core/java/android/view/ViewPropertyAnimator.java

+6 −6
Original line number Diff line number Diff line
@@ -1113,19 +1113,19 @@ public class ViewPropertyAnimator { 
            if (mListener != null) {

                mListener.onAnimationEnd(animation);

            }

            if (mAnimatorCleanupMap != null) {

                Runnable r = mAnimatorCleanupMap.get(animation);

            if (mAnimatorOnEndMap != null) {

                Runnable r = mAnimatorOnEndMap.get(animation);

                if (r != null) {

                    r.run();

                }

                mAnimatorCleanupMap.remove(animation);

                mAnimatorOnEndMap.remove(animation);

            }

            if (mAnimatorOnEndMap != null) {

                Runnable r = mAnimatorOnEndMap.get(animation);

            if (mAnimatorCleanupMap != null) {

                Runnable r = mAnimatorCleanupMap.get(animation);

                if (r != null) {

                    r.run();

                }

                mAnimatorOnEndMap.remove(animation);

                mAnimatorCleanupMap.remove(animation);

            }

            mAnimatorMap.remove(animation);

        }