commit dbf69e4652d439892080dff3353b1cfd5b4bf6bc
author Doris Liu <tianliu@google.com> Wed Aug 05 20:00:11 2015 -0700
committer Doris Liu <tianliu@google.com> Thu Aug 06 11:02:32 2015 -0700
tree fd6fe06e35dd059d990621e3d4ecd491cd6faf4f
parent 38b452073575c98d0adc673291ba67bb6787dffb

Exclude delay animation from getChildAnimations() list

Bug: 22975427
Change-Id: I8bd9a51f0a886873346d77e9452662301a7c0363

core/java/android/animation/AnimatorSet.java

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 5480193..1065ed8 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -228,7 +228,9 @@
         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;
     }