From a3a3f0dc63492da47cd92b293d4c99043aee2cfd Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Fri, 1 Nov 2024 05:47:13 +0000 Subject: 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 --- services/core/java/com/android/server/wm/WindowContainer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 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); -- cgit v1.2.3-59-g8ed1b