commit 7b36e8a34c77445e85fcb476077689c91f153d8a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Nov 16 00:55:41 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 16 00:55:41 2024 +0000
tree 8b1c22436d27d8f9f32e8432bd60823cfb5856f7
parent 2fdf339d2e091f30cc369b090a9980cdda98345d
parent 646e8f0b9b7c144889f7f0b155abc291e07e8c10

Merge "Prevent assign layer on DisplayArea while in a transition" into main

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

diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java
index 143d1b7..8562bb2 100644
--- a/services/core/java/com/android/server/wm/TransitionController.java
+++ b/services/core/java/com/android/server/wm/TransitionController.java
@@ -658,8 +658,8 @@
         }
         // Always allow WindowState to assign layers since it won't affect transition.
         return wc.asWindowState() != null || (!isPlaying()
-                // Don't assign task while collecting.
-                && !(wc.asTask() != null && isCollecting()));
+                // Don't assign task or display area layers while collecting.
+                && !((wc.asTask() != null || wc.asDisplayArea() != null) && isCollecting()));
     }
 
     @WindowConfiguration.WindowingMode