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

Commit d7ab244c authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Mark the task as reusable while clearing activities in the Task" into... 

Merge "Mark the task as reusable while clearing activities in the Task" into tm-qpr-dev am: b9613ed1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513753



Change-Id: Iae4f1db3684f64ab1d04b950efca7a107dfac888
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 678ce49f b9613ed1

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

+10 −1
Original line number Diff line number Diff line
@@ -5184,7 +5184,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();