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

2016-09-27 00:38:00 +00:00
parent db2fcf6029 4d04b1a446
commit f574ba6eed
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/animation/ObjectAnimator.java
+++ b/core/java/android/animation/ObjectAnimator.java
@@ -977,8 +977,9 @@ public final class ObjectAnimator extends ValueAnimator {
    @Override
    void animateValue(float fraction) {
        final Object target = getTarget();
-        if (target == null) {
-            // We lost the target reference, cancel and clean up.
+        if (mTarget != null && target == null) {
+            // We lost the target reference, cancel and clean up. Note: we allow null target if the
+            /// target has never been set.
            cancel();
            return;
        }