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

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

Merge "Run cleanup before end actions of ViewPropertyAnimator." into nyc-dev am: 58cf2c3d 

am: 3bed2e9a

* commit '3bed2e9a':
  Run cleanup before end actions of ViewPropertyAnimator.

Change-Id: I188f208092f28082a029e6a71cb37c2c1d5fc63a
parents 724fb136 3bed2e9a

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 (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);

            }

            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);

            }

            mAnimatorMap.remove(animation);

        }