Merge "Revert "Clear controls and animations in temp arrays after using them"" into sc-dev

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index b6b8a2daf160..c201e3beb9b2 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -601,6 +601,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
                 return;
             }
 
+            mTmpFinishedControls.clear();
+            mTmpRunningAnims.clear();
             InsetsState state = new InsetsState(mState, true /* copySources */);
             for (int i = mRunningAnimations.size() - 1; i >= 0; i--) {
                 RunningAnimation runningAnimation = mRunningAnimations.get(i);
@@ -633,12 +635,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
                             anim.getTypeMask(), anim.getInterpolatedFraction()));
                 }
             }
-            mTmpRunningAnims.clear();
 
             for (int i = mTmpFinishedControls.size() - 1; i >= 0; i--) {
                 dispatchAnimationEnd(mTmpFinishedControls.get(i).getAnimation());
             }
-            mTmpFinishedControls.clear();
         };
     }