From 879a626f18bded7b7587f1cef5bd6a491113d413 Mon Sep 17 00:00:00 2001 From: George Mount Date: Wed, 30 Mar 2016 21:33:18 +0000 Subject: [PATCH] Revert "Run cleanup before end actions of ViewPropertyAnimator." This reverts commit e9a4f878528976efb4ec6f3d7797bef44732b00e. This revert is to test to see if the gralloc lock problems are caused by this CL. Change-Id: I395fd3675dd430c44a5d29b050ba248f3f2bf4cd --- core/java/android/view/ViewPropertyAnimator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java index c5b8849e88ab2..f18b7acf64f0d 100644 --- a/core/java/android/view/ViewPropertyAnimator.java +++ b/core/java/android/view/ViewPropertyAnimator.java @@ -1113,13 +1113,6 @@ public class ViewPropertyAnimator { if (mListener != null) { mListener.onAnimationEnd(animation); } - if (mAnimatorCleanupMap != null) { - Runnable r = mAnimatorCleanupMap.get(animation); - if (r != null) { - r.run(); - } - mAnimatorCleanupMap.remove(animation); - } if (mAnimatorOnEndMap != null) { Runnable r = mAnimatorOnEndMap.get(animation); if (r != null) { @@ -1127,6 +1120,13 @@ 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); }