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

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

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

am: 98aa25c2

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

Change-Id: I449067238317b66090e036a40181c27ec892a01d
parents 0264016b 98aa25c2

core/java/android/view/ViewPropertyAnimator.java

+7 −7
Original line number Diff line number Diff line
@@ -1110,6 +1110,13 @@ public class ViewPropertyAnimator { 
        @Override

        public void onAnimationEnd(Animator animation) {

            mView.setHasTransientState(false);

            if (mAnimatorCleanupMap != null) {

                Runnable r = mAnimatorCleanupMap.get(animation);

                if (r != null) {

                    r.run();

                }

                mAnimatorCleanupMap.remove(animation);

            }

            if (mListener != null) {

                mListener.onAnimationEnd(animation);

            }
@@ -1120,13 +1127,6 @@ public class ViewPropertyAnimator { 
                }

                mAnimatorOnEndMap.remove(animation);

            }

            if (mAnimatorCleanupMap != null) {

                Runnable r = mAnimatorCleanupMap.get(animation);

                if (r != null) {

                    r.run();

                }

                mAnimatorCleanupMap.remove(animation);

            }

            mAnimatorMap.remove(animation);

        }