Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jerry Chang
2021-02-25 07:19:44 +00:00
committed by Android (Google) Code Review
parent 30cb582d47 7d0a4d6a69
commit aa48846ced
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -17,7 +17,6 @@
package com.android.server.wm; package com.android.server.wm;
import static android.Manifest.permission.READ_FRAME_BUFFER; 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_CHILDREN_TASKS_REPARENT;
import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER;
import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT;
@@ -426,8 +425,9 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
} }
if (windowingMode > -1) { if (windowingMode > -1) {
if (mService.isInLockTaskMode() && windowingMode != WINDOWING_MODE_FULLSCREEN) { if (mService.isInLockTaskMode()
throw new UnsupportedOperationException("Not supported to set non-fullscreen" && WindowConfiguration.inMultiWindowMode(windowingMode)) {
throw new UnsupportedOperationException("Not supported to set multi-window"
+ " windowing mode during locked task mode."); + " windowing mode during locked task mode.");
} }
container.setWindowingMode(windowingMode); container.setWindowingMode(windowingMode);