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

Merge "Fix launcher immutable list UnsupportedOperationException on swipe up" into main

Browse Source
This commit is contained in:
Will Osborn
2025-03-28 02:37:13 -07:00
committed by Android (Google) Code Review
parent 530ccf25a5 ba8a3ff176
commit fbfb7bf8b3
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TopTaskTracker.java
+11 -10
View File
@@ -66,12 +66,12 @@ import com.android.wm.shell.shared.GroupedTaskInfo;
import com.android.wm.shell.splitscreen.ISplitScreenListener;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Stream;
import javax.inject.Inject;
@@ -369,21 +369,22 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
Collections.addAll(mOrderedTaskList, tasks);
}
List<TaskInfo> tasks = new ArrayList<>(mOrderedTaskList);
// Strip the pinned task and recents task.
tasks.removeIf(t -> t.taskId == mPinnedTaskId || isRecentsTask(t));
Stream<TaskInfo> taskStream = mOrderedTaskList.stream()
// Strip the pinned task and recents task.
.filter(t -> t.taskId != mPinnedTaskId && !isRecentsTask(t));
if (enableOverviewOnConnectedDisplays()) {
tasks = tasks.stream().filter(
info -> ExternalDisplaysKt.getSafeDisplayId(info) == displayId).toList();
taskStream = taskStream.filter(
info -> ExternalDisplaysKt.getSafeDisplayId(info) == displayId);
}
if (enableMultipleDesktops(mContext)) {
tasks = tasks.stream().takeWhile(
taskInfo -> !DesksUtils.isDesktopWallpaperTask(taskInfo)).toList();
taskStream = taskStream.takeWhile(
taskInfo -> !DesksUtils.isDesktopWallpaperTask(taskInfo));
} else {
tasks.removeIf(taskInfo -> DesksUtils.isDesktopWallpaperTask(taskInfo));
taskStream = taskStream.filter(
taskInfo -> !DesksUtils.isDesktopWallpaperTask(taskInfo));
}
return new CachedTaskInfo(tasks, mContext, displayId);
return new CachedTaskInfo(taskStream.toList(), mContext, displayId);
}
}