diff options
| author | Romain Guy <romainguy@android.com> | 2010-02-10 11:29:22 -0800 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2010-02-22 16:08:43 -0800 |
| commit | 37213ce2a612d011003d128e84e675b54c4864c2 (patch) | |
| tree | 2f5a0b6e100787432b1a2276d9fb7bce7ad59e32 | |
| parent | 1b9624365e4161bd14896e8e0413656594c6c462 (diff) | |
| download | base-37213ce2a612d011003d128e84e675b54c4864c2.tar.gz | |
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT 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 16a695f2f5eb..c0581e7ab79a 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) { |