atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

android.animation: prevent NullPointerExceptions

Browse Source
This commit is contained in:
Julian Winkler
2025-06-16 16:37:11 +02:00
committed by Mis012
parent b7843665ef
commit a57da8fcb5
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api-impl/android/animation/ObjectAnimator.java
View File

@@ -576,7 +576,7 @@ public final class ObjectAnimator extends ValueAnimator {
// mValueType may change due to setter/getter setup; do this before calling super.init(),
// which uses mValueType to set up the default type evaluator.
final Object target = getTarget();
if (target != null) {
if (target != null && mValues != null) {
final int numValues = mValues.length;
for (int i = 0; i < numValues; ++i) {
mValues[i].setupSetterAndGetter(target);
@@ -668,9 +668,11 @@ public final class ObjectAnimator extends ValueAnimator {
void animateValue(float fraction) {
final Object target = getTarget();
super.animateValue(fraction);
int numValues = mValues.length;
for (int i = 0; i < numValues; ++i) {
mValues[i].setAnimatedValue(target);
if (mValues != null) {
int numValues = mValues.length;
for (int i = 0; i < numValues; ++i) {
mValues[i].setAnimatedValue(target);
}
}
}