WM: Track waitForConfig per display
If a virtual display is present while the screen is rotated, reconfiguring the virtual display
will set the global mWaitingForConfig flag and can prevent window relayouts and
surface placements for windows on the primary display. This will cause windows to be
drawn incorrectly in the old rotation and get stuck in this state until there is another rotation.
Bug: b/117770934
Test: go/wm-smoke
Test: Test rotation with huddle presenting
Change-Id: I14034a8e8aac857b46702c0108e07adcb4eb8ac5
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 886b2ff..3acacbc 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -352,6 +352,14 @@
int pendingLayoutChanges;
int mDeferredRotationPauseCount;
+ /**
+ * Used to gate application window layout until we have sent the complete configuration.
+ * TODO: There are still scenarios where we may be out of sync with the client. Ideally
+ * we want to replace this flag with a mechanism that will confirm the configuration
+ * applied by the client is the one expected by the system server.
+ */
+ boolean mWaitingForConfig;
+
// TODO(multi-display): remove some of the usages.
@VisibleForTesting
boolean isDefaultDisplay;
@@ -1284,7 +1292,7 @@
+ (oldAltOrientation ? " (alt)" : "") + ", lastOrientation=" + lastOrientation);
if (DisplayContent.deltaRotation(rotation, oldRotation) != 2) {
- mService.mWaitingForConfig = true;
+ mWaitingForConfig = true;
}
mRotation = rotation;
@@ -3675,6 +3683,7 @@
}
mTmpWindow = w;
w.setDisplayLayoutNeeded();
+ w.finishSeamlessRotation(true /* timeout */);
mService.markForSeamlessRotation(w, false);
}, true /* traverseTopToBottom */);