Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c26e8ed6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix AE LockTaskMode issue on fold devices" into main am: 808e7212 am: 2863dc98 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3343520



Change-Id: I5b6aad3e6b2a54dcba442b01da6608eeb4187cfb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45b8c0b9 2863dc98

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -888,7 +888,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 




        if (windowingMode > -1) {

        if (windowingMode > -1) {

            if (mService.isInLockTaskMode()

            if (mService.isInLockTaskMode()

                    && WindowConfiguration.inMultiWindowMode(windowingMode)) {

                    && WindowConfiguration.inMultiWindowMode(windowingMode)

                    && !container.isEmbedded()) {

                Slog.w(TAG, "Dropping unsupported request to set multi-window windowing mode"

                Slog.w(TAG, "Dropping unsupported request to set multi-window windowing mode"

                        + " during locked task mode.");

                        + " during locked task mode.");

                return effects;

                return effects;