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

Commit df1377f8 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Make sure the requested windowing mode is set to the container" into udc-dev am: e1671c02 

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



Change-Id: Ia072ae42e87c6aa86d320993f85665294919f1dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3bf55e0 e1671c02

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

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            }

        }



        final int prevWindowingMode = container.getWindowingMode();

        final int prevWindowingMode = container.getRequestedOverrideWindowingMode();

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

            if (mService.isInLockTaskMode()

                    && WindowConfiguration.inMultiWindowMode(windowingMode)) {