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-18 22:57:38 -0800 |
| commit | 773f3ae2112c40801eeb94d4d824ffe2bdee2470 (patch) | |
| tree | ca886ec9917e1e2eadc922ab519949ddb6e443fd | |
| parent | e34e0f9e51fb455f75ad8e5049ab5b545daeb7ca (diff) | |
| download | base-eclair-sholes-release2.tar.gz | |
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.android-2.1_r2.1seclair-sholes-release2
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) { |