Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1a11124fead819ecdef384aa0714970c047ac493':
  Fix NPEs when inflating a ValueAnimator.
This commit is contained in:
Craig Stout
2014-08-11 15:22:05 +00:00
committed by Android Git Automerger
parent c52af93ba2 55e1a6c916
commit 8cb829dada
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/animation/AnimatorInflater.java
View File

@@ -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();
arrayObjectAnimator.recycle();
if (arrayObjectAnimator != null) {
arrayObjectAnimator.recycle();
}
return anim;
}