Permalink
Browse files

Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO N…

…OT MERGE.

Prevent infinite loop in the Phone UI.
  • Loading branch information...
1 parent e34e0f9 commit 773f3ae2112c40801eeb94d4d824ffe2bdee2470 @romainguy romainguy committed with android-build SharedAccount Feb 10, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 core/java/android/view/animation/Animation.java
@@ -282,8 +282,8 @@ public void cancel() {
*/
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 boolean getTransformation(long currentTime, Transformation outTransformat
if (expired) {
if (mRepeatCount == mRepeated) {
if (!mEnded) {
+ mEnded = true;
if (mListener != null) {
mListener.onAnimationEnd(this);
}
- mEnded = true;
}
} else {
if (mRepeatCount > 0) {

0 comments on commit 773f3ae

Please sign in to comment.