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

Merge "Allow null target in ObjectAnimator if the target has never been set" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-27 00:38:00 +00:00
committed by Android (Google) Code Review
parent db2fcf6029 4d04b1a446
commit f574ba6eed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/animation/ObjectAnimator.java
View File

@@ -977,8 +977,9 @@ public final class ObjectAnimator extends ValueAnimator {
@Override @Override
void animateValue(float fraction) { void animateValue(float fraction) {
final Object target = getTarget(); final Object target = getTarget();
if (target == null) { if (mTarget != null && target == null) {
// We lost the target reference, cancel and clean up. // We lost the target reference, cancel and clean up. Note: we allow null target if the
/// target has never been set.
cancel(); cancel();
return; return;
} }