From dbf69e4652d439892080dff3353b1cfd5b4bf6bc Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Wed, 5 Aug 2015 20:00:11 -0700
Subject: Exclude delay animation from getChildAnimations() list

Bug: 22975427
Change-Id: I8bd9a51f0a886873346d77e9452662301a7c0363
---
 core/java/android/animation/AnimatorSet.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 5480193a8c34..1065ed80e700 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -228,7 +228,9 @@ public final class AnimatorSet extends Animator {
         int size = mNodes.size();
         for (int i = 0; i < size; i++) {
             Node node = mNodes.get(i);
-            childList.add(node.mAnimation);
+            if (node != mRootNode) {
+                childList.add(node.mAnimation);
+            }
         }
         return childList;
     }
-- 
cgit v1.2.3-59-g8ed1b