Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Browse Source 
Prevent infinite loop in the Phone UI.
This commit is contained in:
Romain Guy
2010-02-10 11:29:22 -08:00
committed by Jim Miller
parent 67e9e9df92
commit 00b17659bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/animation/Animation.java
View File

@@ -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) {