summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-03-28 13:44:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 13:44:43 -0700
commit43b78d0418360d0bd50cb075a4d6504bd914025a (patch)
treee8a8dc958d9411de1ae2953899c4e17e92ec650c
parent3c47b9cb93c2b60c63b7ab89fd4650f3799a045e (diff)
parent3d3213b3c90764be9ef59bf68b3b738c20211b5b (diff)
downloadandroid_packages_apps_Trebuchet-43b78d0418360d0bd50cb075a4d6504bd914025a.tar.gz
android_packages_apps_Trebuchet-43b78d0418360d0bd50cb075a4d6504bd914025a.tar.bz2
android_packages_apps_Trebuchet-43b78d0418360d0bd50cb075a4d6504bd914025a.zip
am 3d3213b3: am 98720c96: Fix crash caused by unregistering animation listener
* commit '3d3213b3c90764be9ef59bf68b3b738c20211b5b': Fix crash caused by unregistering animation listener
-rw-r--r--src/com/android/launcher2/FirstFrameAnimatorHelper.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/FirstFrameAnimatorHelper.java b/src/com/android/launcher2/FirstFrameAnimatorHelper.java
index f42a741c6..2351dd074 100644
--- a/src/com/android/launcher2/FirstFrameAnimatorHelper.java
+++ b/src/com/android/launcher2/FirstFrameAnimatorHelper.java
@@ -60,7 +60,7 @@ public class FirstFrameAnimatorHelper implements ValueAnimator.AnimatorUpdateLis
view.getViewTreeObserver().addOnDrawListener(sGlobalDrawListener);
}
- public void onAnimationUpdate(ValueAnimator animation) {
+ public void onAnimationUpdate(final ValueAnimator animation) {
if (mStartTime == -1) {
mStartFrame = sGlobalFrameCounter;
mStartTime = System.currentTimeMillis();
@@ -86,7 +86,11 @@ public class FirstFrameAnimatorHelper implements ValueAnimator.AnimatorUpdateLis
mAdjustedSecondFrameTime = true;
} else {
if (frameNum > 1) {
- animation.removeUpdateListener(this);
+ mTarget.post(new Runnable() {
+ public void run() {
+ animation.removeUpdateListener(FirstFrameAnimatorHelper.this);
+ }
+ });
}
if (DEBUG) print(animation);
}