From 2987dffb7248392ca48d87817b27c09092b1d4bf Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 18 Apr 2016 17:31:24 -0700
Subject: [PATCH] Fix pause/resume for AnimatorSet

Bug: 28251945
Change-Id: Ie98c779791bf181e2e8fbf38bbd453228ce43310
---
 core/java/android/animation/AnimatorSet.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 3385a17002bce..29a24c83461eb 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -538,7 +538,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();
@@ -557,7 +558,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();