diff options
| author | 2024-11-23 03:16:05 +0000 | |
|---|---|---|
| committer | 2024-11-23 03:16:05 +0000 | |
| commit | ad7ec7e33e13e5f9d79168b9618fef3b165db2ad (patch) | |
| tree | 30f7c1dc68418d4ef05d9abb92489ed2c7872594 | |
| parent | 01a047cd267ba7b39cce1d9eb802b19d21cbe365 (diff) | |
| parent | 665e9af6e89e746b03789fe12d620a5e41dcb1ce (diff) | |
Merge "Return early in startTask if taskId is other split stage." into main
| -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 |