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

Commit aa8c686a authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't end task in finishActivityLocked if task is being reused"

parents bd6a8e44 bdef5377

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -3582,7 +3582,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 


            finishActivityResultsLocked(r, resultCode, resultData);



            final boolean endTask = index <= 0;

            final boolean endTask = index <= 0 && !task.isClearingToReuseTask();

            final int transit = endTask ? TRANSIT_TASK_CLOSE : TRANSIT_ACTIVITY_CLOSE;

            if (mResumedActivity == r) {

                if (DEBUG_VISIBILITY || DEBUG_TRANSITION) Slog.v(TAG_TRANSITION,

services/core/java/com/android/server/am/TaskRecord.java

+7 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,13 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 
                && (mResizeMode != RESIZE_MODE_FORCE_RESIZABLE_LANDSCAPE_ONLY || landscape);

    }



    /**

     * @return {@code true} if the task is being cleared for the purposes of being reused.

     */

    boolean isClearingToReuseTask() {

        return mReuseTask;

    }



    /**

     * Find the activity in the history stack within the given task.  Returns

     * the index within the history at which it's found, or < 0 if not found.