diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index e788d2749d172..8ff38bb8647bd 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -559,7 +559,8 @@ public final class AnimatorSet extends Animator { boolean previouslyPaused = mPaused; super.pause(); if (!previouslyPaused && mPaused) { - if (mDelayAnim != null) { + if (mDelayAnim.isStarted()) { + // If delay hasn't passed, pause the start delay animator. mDelayAnim.pause(); } else { int size = mNodes.size(); @@ -578,7 +579,8 @@ public final class AnimatorSet extends Animator { boolean previouslyPaused = mPaused; super.resume(); if (previouslyPaused && !mPaused) { - if (mDelayAnim != null) { + if (mDelayAnim.isStarted()) { + // If start delay hasn't passed, resume the previously paused start delay animator mDelayAnim.resume(); } else { int size = mNodes.size();