summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2011-06-16 13:55:11 -0700
committerChet Haase <chet@google.com>2011-06-16 14:03:08 -0700
commit3a000a52d6863bd1c6c9822a9cfd83e00f3aaf79 (patch)
tree12da625d46d2a00c9fdd0f78490539d206e6ba2f /core/java
parentf66abd3c07451a4b041c80ebf396d78a6d7fe644 (diff)
downloadframeworks_base-3a000a52d6863bd1c6c9822a9cfd83e00f3aaf79.zip
frameworks_base-3a000a52d6863bd1c6c9822a9cfd83e00f3aaf79.tar.gz
frameworks_base-3a000a52d6863bd1c6c9822a9cfd83e00f3aaf79.tar.bz2
Fix crash in ViewPropertyAnimator for unparented view.
Mechanism for removing possible earlier animations should call removeCallbacks on the view, not on the (possibly null) handler of the view. Change-Id: I76c6f0bea5e009be9197a6e49e9360ed9ef1a9cb
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/ViewPropertyAnimator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java
index 9eddf23..a3de285 100644
--- a/core/java/android/view/ViewPropertyAnimator.java
+++ b/core/java/android/view/ViewPropertyAnimator.java
@@ -349,7 +349,7 @@ public class ViewPropertyAnimator {
}
}
mPendingAnimations.clear();
- mView.getHandler().removeCallbacks(mAnimationStarter);
+ mView.removeCallbacks(mAnimationStarter);
}
/**
@@ -705,7 +705,7 @@ public class ViewPropertyAnimator {
NameValuesHolder nameValuePair = new NameValuesHolder(constantName, startValue, byValue);
mPendingAnimations.add(nameValuePair);
- mView.getHandler().removeCallbacks(mAnimationStarter);
+ mView.removeCallbacks(mAnimationStarter);
mView.post(mAnimationStarter);
}