commit 646e8f0b9b7c144889f7f0b155abc291e07e8c10
author Gaurav Bhola <gauravbhola@google.com> Wed Nov 13 23:09:31 2024 -0800
committer Gaurav Bhola <gauravbhola@google.com> Thu Nov 14 14:35:20 2024 -0800
tree 2ecf08a91f39e6bd3f57c5f9b07fbe696c6ea662
parent 74e02acd2b2e1d39d87a4e437a151b0cfc330cfc

Prevent assign layer on DisplayArea while in a transition

FLAG: EXEMPT (Bug fix)
Fix: 379122353
Test: manually by doing setLayer on DA in start and end transaction
Change-Id: I7c0eb2e171b8dff6315370509b41a5d938d14ad0

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 87bdfa4..65065e5 100644
--- a/services/core/java/com/android/server/wm/TransitionController.java
+++ b/services/core/java/com/android/server/wm/TransitionController.java
@@ -640,8 +640,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