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

Commit 2863dc98 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 

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



Change-Id: I4d207b43c5186c703a01f39cd1b82d11a404748b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37da1d0a 808e7212

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

+2 −1
Original line number Diff line number Diff line
@@ -872,7 +872,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;