Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5107dff0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev

parents 2eacb5c6 c779ae54
Loading
Loading
Loading
Loading
+25 −17
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ public class TaskbarUIController {
                (Consumer<Task>) foundTask -> {
                    if (foundTask != null) {
                        TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id);
                        // 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,
@@ -203,7 +209,10 @@ public class TaskbarUIController {
                                    foundTaskView.getThumbnail(),
                                    foundTaskView.getThumbnail().getThumbnail(),
                                    null /* intent */);
                    } else {
                            return;
                        }
                    }

                    // No running app of that type, create a new instance as second app.
                    recents.confirmSplitSelect(
                            null /* containerTaskView */,
@@ -213,7 +222,6 @@ public class TaskbarUIController {
                            null /* thumbnail */,
                            intent);
                }
                }
        );
    }
}