diff options
| author | 2024-11-14 12:08:25 +0000 | |
|---|---|---|
| committer | 2024-11-14 12:08:25 +0000 | |
| commit | c26e8ed6205682cc298e32d74cba6f3a78e25c72 (patch) | |
| tree | 23a3a9d13c7f26723eaaa8cc5b759a1346759c87 | |
| parent | 45b8c0b9762d0def4190467db28b4e0e104f0ef3 (diff) | |
| parent | 2863dc980110082176435579cb04f694f1e11033 (diff) | |
Merge "Fix AE LockTaskMode issue on fold devices" into main am: 808e7212e3 am: 2863dc9801
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3343520
Change-Id: I5b6aad3e6b2a54dcba442b01da6608eeb4187cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowOrganizerController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 565f75b58230..091896590b6b 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -888,7 +888,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 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; |