Merge changes from topic "presubmit-am-e1291358894f4d2780fd24b49ec03274" into tm-qpr-dev-plus-aosp

* changes:
  [automerge] Fixes flicker of not applying initial transform to leash 2p: f91f797e5a
  Fixes flicker of not applying initial transform to leash

1 files changed, 4 insertions, 4 deletions

diff --git a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
index 1ae7816ecd24..51ace49fd50f 100644
--- a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
+++ b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
@@ -220,11 +220,11 @@ class SurfaceAnimationRunner {
                 if (!mAnimationStartDeferred && mPreProcessingAnimations.isEmpty()) {
                     mChoreographer.postFrameCallback(this::startAnimations);
                 }
-
-                // Some animations (e.g. move animations) require the initial transform to be
-                // applied immediately.
-                applyTransformation(runningAnim, t, 0 /* currentPlayTime */);
             }
+
+            // Some animations (e.g. move animations) require the initial transform to be
+            // applied immediately.
+            applyTransformation(runningAnim, t, 0 /* currentPlayTime */);
         }
     }