diff options
| author | Chet Haase <chet@google.com> | 2014-07-14 18:28:28 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2014-07-15 17:39:48 +0000 |
| commit | 4ae3e6af08919e31174e049d2509e73a9bebb2b3 (patch) | |
| tree | ed289576f690f58aec78f42f14b232e8575a3d73 /core/java/android/animation | |
| parent | d7671a710035cb761fed444c13c61ccef6a1489f (diff) | |
| download | frameworks_base-4ae3e6af08919e31174e049d2509e73a9bebb2b3.zip frameworks_base-4ae3e6af08919e31174e049d2509e73a9bebb2b3.tar.gz frameworks_base-4ae3e6af08919e31174e049d2509e73a9bebb2b3.tar.bz2 | |
Set existing TypeEvaluator on new KeyframeSet when changing object values
This avoids NullPointerException crash when changing values without
first canceling a running animator.
Issue #16245303 KeyframeSet crash on null keyframe or evaluator
Change-Id: I50ce5223310fe87e3382c446e2d36d93ae38a8fe
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/PropertyValuesHolder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java index bf2924c..bdfbde1 100644 --- a/core/java/android/animation/PropertyValuesHolder.java +++ b/core/java/android/animation/PropertyValuesHolder.java @@ -631,6 +631,9 @@ public class PropertyValuesHolder implements Cloneable { public void setObjectValues(Object... values) { mValueType = values[0].getClass(); mKeyframeSet = KeyframeSet.ofObject(values); + if (mEvaluator != null) { + mKeyframeSet.setEvaluator(mEvaluator); + } } /** |