summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2011-06-16 14:06:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-16 14:06:36 -0700
commitb47f2f9533ec76be0228e53959aa3c93d4e1c355 (patch)
tree51e7ae2246bc2488f19199d48ede796822b2003b /core/java/android
parentdd9f7750e39f939de0cc537efc304e7ae141cac1 (diff)
parent3a000a52d6863bd1c6c9822a9cfd83e00f3aaf79 (diff)
downloadframeworks_base-b47f2f9533ec76be0228e53959aa3c93d4e1c355.zip
frameworks_base-b47f2f9533ec76be0228e53959aa3c93d4e1c355.tar.gz
frameworks_base-b47f2f9533ec76be0228e53959aa3c93d4e1c355.tar.bz2
Merge "Fix crash in ViewPropertyAnimator for unparented view."
Diffstat (limited to 'core/java/android')
-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);
}