Merge "Still request sync draw if the window is not in sync group" into tm-qpr-dev am: e6c0cb83ce am: 15ea925dac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157292

Change-Id: Idfcde2ebfe4c5877283801ddd6ce0d87b0b3636d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/wm/WindowState.java

@@ -5572,7 +5572,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
                 mLastSurfaceInsets.set(mAttrs.surfaceInsets);
             }
             if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation()
-                    && okToDisplay() && !useBLASTSync()) {
+                    && okToDisplay() && mSyncState == SYNC_STATE_NONE) {
                 applyWithNextDraw(mSetSurfacePositionConsumer);
             } else {
                 mSetSurfacePositionConsumer.accept(t);
@@ -6009,7 +6009,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
         // We could be more subtle with Integer.MAX_VALUE and track a seqId in the timeout.
         finishDrawing(null, Integer.MAX_VALUE);
         mWmService.mH.removeMessages(WINDOW_STATE_BLAST_SYNC_TIMEOUT, this);
-        if (!useBLASTSync()) return;
     }
 
     @Override