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

Commit 8ce3a826 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "don't call the reparent method when the old parent of task is removed." into main

parents 93b38e1b 092371ab
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -1655,6 +1655,12 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
        activityIdleInternal(null /* idleActivity */, false /* fromTimeout */,
                true /* processPausingActivities */, null /* configuration */);

        if (rootTask.getParent() == null) {
            // The activities in the task may already be finishing. Then the task could be removed
            // when performing the idle check.
            return;
        }

        // Reparent all the tasks to the bottom of the display
        final DisplayContent toDisplay =
                mRootWindowContainer.getDisplayContent(DEFAULT_DISPLAY);