From 8149f57bec0a634d1630a1df9dbab681ced8987c Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Mon, 11 Apr 2022 18:33:37 -0700
Subject: [PATCH] Do position-update on current sync if sync active

If blast-sync is active, then the syncTransaction is already
"waiting" until the frame is drawn or we have just received
the new frame. Since this is the case, just put the position
on that same transaction instead of queueing up a redundant
redraw.

Bug: 228885074
Test: with shell-transitions, enter split with an auto-pip,
      then swipe-to-home.
Change-Id: Ib5629718a1cf50746e519dcdf7a633e6f5066527
---
 services/core/java/com/android/server/wm/WindowState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index e7d4877ce5142..765185c9efac9 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5586,7 +5586,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
                 mLastSurfaceInsets.set(mAttrs.surfaceInsets);
             }
             if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation()
-                    && okToDisplay()) {
+                    && okToDisplay() && !useBLASTSync()) {
                 applyWithNextDraw(mSetSurfacePositionConsumer);
             } else {
                 mSetSurfacePositionConsumer.accept(t);