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

Fix bug with trying to split an app with itself

Browse Source 
This patch fixes the following user flow:
1) App is already running
2) User initiates splitscreen from Home with that app
3) User selects the same app from Taskbar or AllApps

Previously, this caused a crash because the split-from-home initiation removed the corresponding app tile, causing a null pointer exception when the same task ID was used as a split target.

Fixed by adding a null check: if the target TaskView can't be found for any reason, fall back to launching the second app via Intent instead. If the app doesn't support multi-instance, the UI will now show an attempted split, followed by the message "This app can only be opened in 1 window."

Fixes: 263041522
Fixes: 266218404
Test: Manual
Change-Id: I39ed60c9ac758ac215391f0618f44f7fcee4f32c
This commit is contained in:
Jeremy Sim
2023-01-31 10:54:19 +08:00
parent dbc5e56e07
commit c779ae54ce
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+25 -17
View File
@@ -175,24 +175,32 @@ public class TaskbarUIController {
(Consumer<Task>) foundTask -> {
if (foundTask != null) {
TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id);
// There is already a running app of this type, use that as second app.
recents.confirmSplitSelect(
foundTaskView,
foundTaskView.getTask(),
foundTaskView.getIconView().getDrawable(),
foundTaskView.getThumbnail(),
foundTaskView.getThumbnail().getThumbnail(),
null /* intent */);
} else {
// No running app of that type, create a new instance as second app.
recents.confirmSplitSelect(
null /* containerTaskView */,
null /* task */,
new BitmapDrawable(info.bitmap.icon),
startingView,
null /* thumbnail */,
intent);
// TODO (b/266482558): This additional null check is needed because there
// are times when our Tasks list doesn't match our TaskViews list (like when
// a tile is removed during {@link RecentsView#applyLoadPlan()}. A clearer
// state management system is in the works so that we don't need to rely on
// null checks as much. See comments at ag/21152798.
if (foundTaskView != null) {
// There is already a running app of this type, use that as second app.
recents.confirmSplitSelect(
foundTaskView,
foundTaskView.getTask(),
foundTaskView.getIconView().getDrawable(),
foundTaskView.getThumbnail(),
foundTaskView.getThumbnail().getThumbnail(),
null /* intent */);
return;
}
}
// No running app of that type, create a new instance as second app.
recents.confirmSplitSelect(
null /* containerTaskView */,
null /* task */,
new BitmapDrawable(info.bitmap.icon),
startingView,
null /* thumbnail */,
intent);
}
);
}