Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cb829da authored by Craig Stout's avatar Craig Stout Committed by Android Git Automerger
Browse files

am 1a11124f: am a0fb1aa2: Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev 

* commit '1a11124fead819ecdef384aa0714970c047ac493':
  Fix NPEs when inflating a ValueAnimator.
parents c52af93b 55e1a6c9

core/java/android/animation/AnimatorInflater.java

+9 −7
Original line number Diff line number Diff line
@@ -244,8 +244,7 @@ public class AnimatorInflater { 
    }



    /**

     * @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 @@ public class AnimatorInflater { 
        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 @@ public class AnimatorInflater { 
                arrayObjectAnimator = res.obtainAttributes(attrs, R.styleable.PropertyAnimator);

            }

        }



        if (anim == null) {

            anim = new ValueAnimator();

        }



        parseAnimatorFromTypeArray(anim, arrayAnimator, arrayObjectAnimator);



        final int resID =
@@ -601,7 +601,9 @@ public class AnimatorInflater { 
        }



        arrayAnimator.recycle();

        if (arrayObjectAnimator != null) {

            arrayObjectAnimator.recycle();

        }



        return anim;

    }