diff options
| author | Romain Guy <romainguy@google.com> | 2010-02-10 11:30:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-10 11:30:03 -0800 |
| commit | 46b8efa9904b0067d63dc423daca4dccef196f37 (patch) | |
| tree | cf3de4b88264783c50fe0d3e20c7a219ab626035 | |
| parent | d0efb6bc159b86dfad540aa9dc3e20e1bb56d930 (diff) | |
| parent | 5180d1c52209f6cd86f2273da6105205c505510a (diff) | |
| download | frameworks_base-46b8efa9904b0067d63dc423daca4dccef196f37.zip frameworks_base-46b8efa9904b0067d63dc423daca4dccef196f37.tar.gz frameworks_base-46b8efa9904b0067d63dc423daca4dccef196f37.tar.bz2 | |
Merge "Prevent infinite loop in the Phone UI."
| -rw-r--r-- | core/java/android/view/animation/Animation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java index 337fe58..349b7e5 100644 --- a/core/java/android/view/animation/Animation.java +++ b/core/java/android/view/animation/Animation.java @@ -281,8 +281,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); } } @@ -776,10 +776,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) { |