Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev

Author: cdotstout

core/java/android/animation/AnimatorInflater.java

@@ -244,8 +244,7 @@ public PathParser.PathDataNode[] evaluate(float fraction,
     }
 
     /**
-     * @param anim Null if this is a ValueAnimator, otherwise this is an
-     *            ObjectAnimator
+     * @param anim The animator, must not be null
      * @param arrayAnimator Incoming typed array for Animator's attributes.
      * @param arrayObjectAnimator Incoming typed array for Object Animator's
      *            attributes.
@@ -259,10 +258,6 @@ private static void parseAnimatorFromTypeArray(ValueAnimator anim,
         int valueType = arrayAnimator.getInt(R.styleable.Animator_valueType,
                 VALUE_TYPE_FLOAT);
 
-        if (anim == null) {
-            anim = new ValueAnimator();
-        }
-
         TypeEvaluator evaluator = null;
 
         boolean getFloats = (valueType == VALUE_TYPE_FLOAT);
@@ -592,6 +587,11 @@ private static ValueAnimator loadAnimator(Resources res, Theme theme,
                 arrayObjectAnimator = res.obtainAttributes(attrs, R.styleable.PropertyAnimator);
             }
         }
+
+        if (anim == null) {
+            anim = new ValueAnimator();
+        }
+
         parseAnimatorFromTypeArray(anim, arrayAnimator, arrayObjectAnimator);
 
         final int resID =
@@ -601,7 +601,9 @@ private static ValueAnimator loadAnimator(Resources res, Theme theme,
         }
 
         arrayAnimator.recycle();
-        arrayObjectAnimator.recycle();
+        if (arrayObjectAnimator != null) {
+            arrayObjectAnimator.recycle();
+        }
 
         return anim;
     }