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

am 6e72ff90: Merge "Fix latent bug with reinitializing an ObjectAnimator." into honeycomb

Browse Source 
* commit '6e72ff9082f82885d738f637d40bfe43d267107a':
  Fix latent bug with reinitializing an ObjectAnimator.
This commit is contained in:
Patrick Dubroy
2011-01-16 14:58:12 -08:00
committed by Android Git Automerger
parent ae566d937d 6e72ff9082
commit 8a0efde52a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/animation/ObjectAnimator.java
View File

@@ -340,8 +340,9 @@ public final class ObjectAnimator extends ValueAnimator {
@Override @Override
public void setTarget(Object target) { public void setTarget(Object target) {
if (mTarget != target) { if (mTarget != target) {
final Object oldTarget = mTarget;
mTarget = target; mTarget = target;
if (mTarget != null && target != null && mTarget.getClass() == target.getClass()) { if (oldTarget != null && target != null && oldTarget.getClass() == target.getClass()) {
return; return;
} }
// New target type should cause re-initialization prior to starting // New target type should cause re-initialization prior to starting