Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev (6bb61e25) · Commits · e / os / android_frameworks_base

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