summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2024-10-25 15:59:04 -0700
committer Evan Rosky <erosky@google.com> 2024-12-09 10:23:15 -0800
commit8902abfc7c3471488a3b2370a4e5e0af29c4ed24 (patch)
tree80ca55d1cbe2e8172ca17bfb4a35af12cf4ee8e4
parent0797aec73cdbf32ca3825e06b52b02e31cb6526c (diff)
Don't send seqId in relayout if layout hasn't happened
During display rotation, until we've figured out the actual display configuration, we skip layouting the containers. This meant we were accidentally sending a seqId for a relayout that didn't happen yet. Bug: 372767189 Test: pip2 enter-pip with fixed-rotation. Flag: EXEMPT bugfix Change-Id: If12d7bc14444c62d4b6eab1a6c84180424221cc8
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 00ade8088e82..2e58ae7b9130 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2672,7 +2672,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (outRelayoutResult != null) {
if (win.syncNextBuffer() && viewVisibility == View.VISIBLE
- && win.mSyncSeqId > lastSyncSeqId) {
+ && win.mSyncSeqId > lastSyncSeqId && !displayContent.mWaitingForConfig) {
outRelayoutResult.syncSeqId = win.shouldSyncWithBuffers()
? win.mSyncSeqId
: -1;