Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Prevent infinite loop in the Phone UI.

Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Prevent infinite loop in the Phone UI.
773f3ae2 · Romain Guy · android-build SharedAccount · e34e0f9e · 773f3ae2
Commit 773f3ae2 authored 15 years ago by Romain Guy Committed by android-build SharedAccount 15 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

core/java/android/view/animation/Animation.java core/java/android/view/animation/Animation.java +2 -2

No files found.
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -282,8 +282,8 @@ public abstract class Animation implements Cloneable {
     */
    public void detach() {
        if (mStarted && !mEnded) {
-            if (mListener != null) mListener.onAnimationEnd(this);
            mEnded = true;
+            if (mListener != null) mListener.onAnimationEnd(this);
        }
    }

@@ -777,10 +777,10 @@ public abstract class Animation implements Cloneable {
        if (expired) {
            if (mRepeatCount == mRepeated) {
                if (!mEnded) {
+                    mEnded = true;
                    if (mListener != null) {
                        mListener.onAnimationEnd(this);
                    }
-                    mEnded = true;
                }
            } else {
                if (mRepeatCount > 0) {