summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2024-11-01 05:47:13 +0000
committer Riddle Hsu <riddlehsu@google.com> 2024-11-01 07:06:56 +0000
commita3a3f0dc63492da47cd92b293d4c99043aee2cfd (patch)
treeabfc8962c831c32a4a2bda474d1c9fe631fef973
parent428aef405975f5e07e8e47afaf91823ea3c338a4 (diff)
Do not collect WindowState when moving to a different display
WindowState won't be the transition target, so exclude them to reduce noise. Bug: 373410849 Flag: EXEMPT bugfix Test: atest TransitionTests#testCollectReparentChange Change-Id: I3b420607bce46f61f1a9328f192b16e16e99632e
-rw-r--r--services/core/java/com/android/server/wm/WindowContainer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 6c92ae6bb3e7..552584222711 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -1117,7 +1117,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
*/
void onDisplayChanged(DisplayContent dc) {
if (mDisplayContent != null && mDisplayContent != dc) {
- mTransitionController.collect(this);
+ if (asWindowState() == null) {
+ mTransitionController.collect(this);
+ }
// Cancel any change transition queued-up for this container on the old display when
// this container is moved from the old display.
mDisplayContent.mClosingChangingContainers.remove(this);