summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-02-10 11:29:22 -0800
committerRomain Guy <romainguy@android.com>2010-02-10 11:29:22 -0800
commit5180d1c52209f6cd86f2273da6105205c505510a (patch)
treea2e0c10ca14f066e1505199bc1b185cb57b6087a /core
parent739e1f8cdaee7ad448086f61412d118cb18152c5 (diff)
downloadframeworks_base-5180d1c52209f6cd86f2273da6105205c505510a.zip
frameworks_base-5180d1c52209f6cd86f2273da6105205c505510a.tar.gz
frameworks_base-5180d1c52209f6cd86f2273da6105205c505510a.tar.bz2
Prevent infinite loop in the Phone UI.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/animation/Animation.java4
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) {