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

Commit ce2725ae 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 

am: a140391f

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

Change-Id: Iaf2b975c7c0f0bfd064b8bde54e812f83d0198a5
parents 1694a1cd a140391f

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

        }