summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Min Chen <minch@google.com> 2025-03-24 10:15:33 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-24 10:15:33 -0700
commitc5ce7518235f54300689707caff64809870b3e7d (patch)
tree752e9c4a67786dc28df4a82bd86dd86a67ffa4e6
parent8ce6537d8e7617750cecb5215b156125d7881f6c (diff)
parente3579caf4908a483aed6b97bfc878a265878da6e (diff)
Merge "Make `splitBounds` of `forSplitTasks` nullable" into main
-rw-r--r--libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java
index f68afea92850..006dc1439d6d 100644
--- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java
+++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedTaskInfo.java
@@ -124,7 +124,7 @@ public class GroupedTaskInfo implements Parcelable {
* Create new for a pair of tasks in split screen
*/
public static GroupedTaskInfo forSplitTasks(@NonNull TaskInfo task1,
- @NonNull TaskInfo task2, @NonNull SplitBounds splitBounds) {
+ @NonNull TaskInfo task2, @Nullable SplitBounds splitBounds) {
return new GroupedTaskInfo(/* deskId = */ -1, /* displayId = */ INVALID_DISPLAY,
List.of(task1, task2),
splitBounds, TYPE_SPLIT, /* minimizedFreeformTaskIds = */ null);