commit 43830e6168a7aa0ce891a92f63ebdb500c4227c5
author Riddle Hsu <riddlehsu@google.com> Thu Nov 24 16:43:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 24 16:43:38 2022 +0000
tree 9f614ea0b3f8673ec2e7e3139df28988493d23cd
parent 11c4903f5fa6e6ca59c52f7ba3402b6c6543404d
parent 4d18e2d5582b6e9e33049959561e97ac0af40b51

Merge "Finish sync for relayout a drawn window" into tm-qpr-dev am: 4d18e2d558

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

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

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 9db5170..63344a0 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2587,6 +2587,12 @@
                         && win.mSyncSeqId > lastSyncSeqId) {
                     maybeSyncSeqId = win.shouldSyncWithBuffers() ? win.mSyncSeqId : -1;
                     win.markRedrawForSyncReported();
+                    if (win.mSyncState == WindowContainer.SYNC_STATE_WAITING_FOR_DRAW
+                            && winAnimator.mDrawState == WindowStateAnimator.HAS_DRAWN
+                            && maybeSyncSeqId < 0) {
+                        // Do not wait for a drawn window which won't report draw.
+                        win.onSyncFinishedDrawing();
+                    }
                 } else {
                     maybeSyncSeqId = -1;
                 }