PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a crash on null getLegacyBaseTask" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-04-17 21:51:27 -07:00
committed by Android (Google) Code Review
parent a0fc328fa2 95922915a1
commit c562b3ce4e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TopTaskTracker.java
+7 -4
View File
@@ -566,8 +566,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
return result;
}
private boolean isDesktopTask(TaskInfo taskInfo) {
return canEnterDesktopMode(mContext)
private boolean isDesktopTask(@Nullable TaskInfo taskInfo) {
return taskInfo != null && canEnterDesktopMode(mContext)
&& taskInfo.configuration.windowConfiguration.getWindowingMode()
== WindowConfiguration.WINDOWING_MODE_FREEFORM;
}
@@ -581,7 +581,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
* @param splitTaskIds provide if it is for split, which represents the task ids of the
* paired tasks. Otherwise, provide null.
*/
public GroupedTaskInfo getPlaceholderGroupedTaskInfo(@Nullable int[] splitTaskIds) {
public @Nullable GroupedTaskInfo getPlaceholderGroupedTaskInfo(
@Nullable int[] splitTaskIds) {
if (enableShellTopTaskTracking()) {
if (mVisibleTasks == null) {
return null;
@@ -612,7 +613,9 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
baseTaskInfo), /* minimizedFreeformTaskIds = */
Collections.emptySet());
}
return GroupedTaskInfo.forFullscreenTasks(baseTaskInfo);
return baseTaskInfo == null
? null
: GroupedTaskInfo.forFullscreenTasks(baseTaskInfo);
}
}
}