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

Commit 0093fe51 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE when pinning task from split screen" into sc-dev am: aa48846c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e26244beb8dd7f42269a5c018f2621403ccde65
parents ca6428d0 aa48846c

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

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.wm;



import static android.Manifest.permission.READ_FRAME_BUFFER;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT;

import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER;

import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT;
@@ -426,8 +425,9 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
        }



        if (windowingMode > -1) {

            if (mService.isInLockTaskMode() && windowingMode != WINDOWING_MODE_FULLSCREEN) {

                throw new UnsupportedOperationException("Not supported to set non-fullscreen"

            if (mService.isInLockTaskMode()

                    && WindowConfiguration.inMultiWindowMode(windowingMode)) {

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

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

            }

            container.setWindowingMode(windowingMode);