diff options
| author | 2024-11-21 14:33:37 -0800 | |
|---|---|---|
| committer | 2024-11-21 15:46:09 -0800 | |
| commit | 665e9af6e89e746b03789fe12d620a5e41dcb1ce (patch) | |
| tree | 0dd2067383a8a5b7da2272020f638583af9cdcdb | |
| parent | 94bf7a71142b1917e6b1a3e95d7bcaa754a587ad (diff) | |
Return early in startTask if taskId is other split stage.
Fixes a crash from calling startTask with a taskId that's already open
in split.
Bug: 380321878
Test: Manual
Flag: EXEMPT bugfix
Change-Id: I8efd5d4a4beab937f54b6f9fd0a09f91e21cbd15
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index 4f0f6760a951..6e0e696e15fe 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -582,6 +582,7 @@ public class SplitScreenController implements SplitDragPolicy.Starter, @Nullable WindowContainerToken hideTaskToken) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, "Legacy startTask does not support hide task token"); + if (isTaskInSplitScreenForeground(taskId)) return; final int[] result = new int[1]; IRemoteAnimationRunner wrapper = new IRemoteAnimationRunner.Stub() { @Override |