commit 773f3ae2112c40801eeb94d4d824ffe2bdee2470
author Romain Guy <romainguy@android.com> Wed Feb 10 11:29:22 2010 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Thu Feb 18 22:57:38 2010 -0800
tree ca886ec9917e1e2eadc922ab519949ddb6e443fd
parent e34e0f9e51fb455f75ad8e5049ab5b545daeb7ca

Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Prevent infinite loop in the Phone UI.

core/java/android/view/animation/Animation.java

diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index 16a695f..c0581e7 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -282,8 +282,8 @@
      */
     public void detach() {
         if (mStarted && !mEnded) {
-            if (mListener != null) mListener.onAnimationEnd(this);
             mEnded = true;
+            if (mListener != null) mListener.onAnimationEnd(this);
         }
     }
 
@@ -777,10 +777,10 @@
         if (expired) {
             if (mRepeatCount == mRepeated) {
                 if (!mEnded) {
+                    mEnded = true;
                     if (mListener != null) {
                         mListener.onAnimationEnd(this);
                     }
-                    mEnded = true;
                 }
             } else {
                 if (mRepeatCount > 0) {