am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev

* commit 'aa6270375263ebf6da4f2f0de31df808eb278563':
  Cancel animation when target changes.

core/java/android/animation/ObjectAnimator.java

@@ -885,7 +885,8 @@ public final class ObjectAnimator extends ValueAnimator {
     }
 
     /**
-     * Sets the target object whose property will be animated by this animation
+     * Sets the target object whose property will be animated by this animation. If the
+     * animator has been started, it will be canceled.
      *
      * @param target The object being animated
      */
@@ -893,6 +894,9 @@ public final class ObjectAnimator extends ValueAnimator {
     public void setTarget(@Nullable Object target) {
         final Object oldTarget = getTarget();
         if (oldTarget != target) {
+            if (isStarted()) {
+                cancel();
+            }
             mTarget = target == null ? null : new WeakReference<Object>(target);
             // New target should cause re-initialization prior to starting
             mInitialized = false;