diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2016-07-26 15:11:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-26 15:11:27 +0000 |
| commit | a06d1f8fec719c01721a147fd5223dcafe693a7c (patch) | |
| tree | 840c995e92a45015b367133e503c045f1de52dcc /core/java/android/animation | |
| parent | c99406921ff44ed9afba7f9c8ea427aeab2625c4 (diff) | |
| parent | 705e2fb40c7ec0551b8060e72943ec4e15bf032c (diff) | |
Fix NPE in ValueAnimator am: 543a7ed7af
am: 705e2fb40c
Change-Id: I5beab0d64c1544344f1153f183c513839f673a1f
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/ObjectAnimator.java | 2 | ||||
| -rw-r--r-- | core/java/android/animation/ValueAnimator.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 5c4b979ccb3c..9a2aa302a4ba 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -977,7 +977,7 @@ public final class ObjectAnimator extends ValueAnimator { @Override void animateValue(float fraction) { final Object target = getTarget(); - if (mTarget != null && target == null) { + if (target == null) { // We lost the target reference, cancel and clean up. cancel(); return; diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 2f2d9d6075e6..f93a1d82d835 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -982,6 +982,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio mStarted = true; mPaused = false; mRunning = false; + mAnimationEndRequested = false; // Resets mLastFrameTime when start() is called, so that if the animation was running, // calling start() would put the animation in the // started-but-not-yet-reached-the-first-frame phase. |