From 00b17659bb4b2774580eea523c5f23b588105ab6 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Wed, 10 Feb 2010 11:29:22 -0800
Subject: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO
 NOT MERGE.

Prevent infinite loop in the Phone UI.
---
 core/java/android/view/animation/Animation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 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) {
-- 
cgit v1.1