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

Prevent NPE when pinning task from split screen

Browse Source 
When task is locked from split screen, it resets windowing mode to
undefined. Update to allow un-specifying windowing mode during lock task
mode.

Fix: 179399676
Test: pinning task from split screen won't crash
Change-Id: If094dff1de41f5eda31ce945e663a419e08580bd
This commit is contained in:
Jerry Chang
2021-02-24 15:50:19 +08:00
parent 0088eefaac
commit 7d0a4d6a69
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;
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);