Merge "Fix TechChange's assumption about TextView targets" into klp-dev

1 files changed, 6 insertions, 3 deletions

diff --git a/core/java/android/transition/TextChange.java b/core/java/android/transition/TextChange.java
index 4f14d462675d..0b1e4e1373e8 100644
--- a/core/java/android/transition/TextChange.java
+++ b/core/java/android/transition/TextChange.java
@@ -137,14 +137,17 @@ public class TextChange extends Transition {
     @Override
     public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
             TransitionValues endValues) {
-        if (startValues == null || endValues == null || !(endValues.view instanceof TextView)) {
+        if (startValues == null || endValues == null ||
+                !(startValues.view instanceof TextView) || !(endValues.view instanceof TextView)) {
             return null;
         }
         final TextView view = (TextView) endValues.view;
         Map<String, Object> startVals = startValues.values;
         Map<String, Object> endVals = endValues.values;
-        final CharSequence startText = (CharSequence) startVals.get(PROPNAME_TEXT);
-        final CharSequence endText = (CharSequence) endVals.get(PROPNAME_TEXT);
+        final CharSequence startText = startVals.get(PROPNAME_TEXT) != null ?
+                (CharSequence) startVals.get(PROPNAME_TEXT) : "";
+        final CharSequence endText = endVals.get(PROPNAME_TEXT) != null ?
+                (CharSequence) endVals.get(PROPNAME_TEXT) : "";
         if (!startText.equals(endText)) {
             view.setText(startText);
             Animator anim;