commit 808e7212e30a388187d68e065808bc61c692a0fc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 11:17:47 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 14 11:17:47 2024 +0000
tree ca02730b9ebe1b86d1a2c8d98854e21928f8054b
parent ad54f58a7d670233d57a862955ee238dcadbe4c6
parent e5c40386e5e164020f9a06ed7ec3fb16a98c5944

Merge "Fix AE LockTaskMode issue on fold devices" into main

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

diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 89ddb3f..a17de65 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -824,7 +824,8 @@
 
         if (windowingMode > -1) {
             if (mService.isInLockTaskMode()
-                    && WindowConfiguration.inMultiWindowMode(windowingMode)) {
+                    && WindowConfiguration.inMultiWindowMode(windowingMode)
+                    && !container.isEmbedded()) {
                 Slog.w(TAG, "Dropping unsupported request to set multi-window windowing mode"
                         + " during locked task mode.");
                 return effects;