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

Commit 52127d13 authored by Louis Chang's avatar Louis Chang
Browse files

Mark the task as reusable while clearing activities in the Task 

All activities above the task root activity in the Task were
finished while starting an Activity that declared with
android:clearTaskOnLaunch=true. In that case, the organizer
removed the secondary TaskFragment since the TaskFragment was
empty. The primary TaskFragment was also removed due to the
finish-primary-with-secondary rule.

Bug: 257559481
Test: repo steps on the bug
Change-Id: I52c019a8c550d6402916f7ae4499fb7692ff04f1
parent a890b22d

services/core/java/com/android/server/wm/Task.java

+10 −1
Original line number Diff line number Diff line
@@ -5200,7 +5200,16 @@ class Task extends TaskFragment { 
        final Task task = taskTop.getTask();



        // If ActivityOptions are moved out and need to be aborted or moved to taskTop.

        final ActivityOptions topOptions = sResetTargetTaskHelper.process(task, forceReset);

        final ActivityOptions topOptions;



        // Set the task to be reused, so the TaskFragment#mClearedTaskForReuse can be set if the

        // embedded activities are finished while reset task.

        mReuseTask = true;

        try {

            topOptions = sResetTargetTaskHelper.process(task, forceReset);

        } finally {

            mReuseTask = false;

        }



        if (mChildren.contains(task)) {

            final ActivityRecord newTop = task.getTopNonFinishingActivity();