commit 58cf2c3da028c9e091eed03868eaaa38625b12b7
author George Mount <mount@google.com> Tue Mar 29 19:54:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 19:54:36 2016 +0000
tree 3705cdf0b94d6da458ebd8e438c8506a02356131
parent bc5aa7a7364088c1698784c7244df27820443797
parent e9a4f878528976efb4ec6f3d7797bef44732b00e

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

core/java/android/view/ViewPropertyAnimator.java

diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java
index f18b7ac..c5b8849 100644
--- a/core/java/android/view/ViewPropertyAnimator.java
+++ b/core/java/android/view/ViewPropertyAnimator.java
@@ -1113,13 +1113,6 @@
             if (mListener != null) {
                 mListener.onAnimationEnd(animation);
             }
-            if (mAnimatorOnEndMap != null) {
-                Runnable r = mAnimatorOnEndMap.get(animation);
-                if (r != null) {
-                    r.run();
-                }
-                mAnimatorOnEndMap.remove(animation);
-            }
             if (mAnimatorCleanupMap != null) {
                 Runnable r = mAnimatorCleanupMap.get(animation);
                 if (r != null) {
@@ -1127,6 +1120,13 @@
                 }
                 mAnimatorCleanupMap.remove(animation);
             }
+            if (mAnimatorOnEndMap != null) {
+                Runnable r = mAnimatorOnEndMap.get(animation);
+                if (r != null) {
+                    r.run();
+                }
+                mAnimatorOnEndMap.remove(animation);
+            }
             mAnimatorMap.remove(animation);
         }