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

Commit 9a94d161 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Drop multi-window mode requests in locked task mode" into udc-dev am: dce3abf8 

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



Change-Id: Iebc237fd9628c181229f951e786509215c8f3961
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 955c4922 dce3abf8

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

+6 −5
Original line number Diff line number Diff line
@@ -684,12 +684,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            }

        }



        final int prevWindowingMode = container.getRequestedOverrideWindowingMode();

        if (windowingMode > -1 && prevWindowingMode != windowingMode) {

        if (windowingMode > -1) {

            if (mService.isInLockTaskMode()

                    && WindowConfiguration.inMultiWindowMode(windowingMode)) {

                throw new UnsupportedOperationException("Not supported to set multi-window"

                        + " windowing mode during locked task mode.");

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

                        + " during locked task mode.");

                return effects;

            }



            if (windowingMode == WindowConfiguration.WINDOWING_MODE_PINNED) {
@@ -699,8 +699,9 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                return effects;

            }



            final int prevMode = container.getRequestedOverrideWindowingMode();

            container.setWindowingMode(windowingMode);

            if (prevWindowingMode != container.getWindowingMode()) {

            if (prevMode != container.getWindowingMode()) {

                // The activity in the container may become focusable or non-focusable due to

                // windowing modes changes (such as entering or leaving pinned windowing mode),

                // so also apply the lifecycle effects to this transaction.