From 4ae3e6af08919e31174e049d2509e73a9bebb2b3 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Mon, 14 Jul 2014 18:28:28 -0700
Subject: 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
---
 core/java/android/animation/PropertyValuesHolder.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java
index bf2924cce2ae..bdfbde1832aa 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);
+        }
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b