diff options
| author | Romain Guy <romainguy@android.com> | 2010-02-10 11:29:22 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-02-17 21:16:36 -0800 |
| commit | 00b17659bb4b2774580eea523c5f23b588105ab6 (patch) | |
| tree | 28102e985273ca72e4ac4ccfff746a09d9f5a278 | |
| parent | 67e9e9df929aad9139f1dc776b15f6c5d64f424e (diff) | |
| download | frameworks_base-00b17659bb4b2774580eea523c5f23b588105ab6.zip frameworks_base-00b17659bb4b2774580eea523c5f23b588105ab6.tar.gz frameworks_base-00b17659bb4b2774580eea523c5f23b588105ab6.tar.bz2 | |
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 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) { |