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

Commit d543c3e1 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Do not finish root activity when reset task"

parents 7f4b4202 f87b2195

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -1873,6 +1873,8 @@ final class ActivityStack { 
        final int numActivities = activities.size();

        final int numActivities = activities.size();

        for (int i = numActivities - 1; i > 0; --i ) {

        for (int i = numActivities - 1; i > 0; --i ) {

            ActivityRecord target = activities.get(i);

            ActivityRecord target = activities.get(i);

            if (target.frontOfTask)

                break;





            final int flags = target.info.flags;

            final int flags = target.info.flags;

            final boolean finishOnTaskLaunch =

            final boolean finishOnTaskLaunch =
@@ -2040,6 +2042,8 @@ final class ActivityStack { 
        // Do not operate on the root Activity.

        // Do not operate on the root Activity.

        for (int i = numActivities - 1; i > 0; --i) {

        for (int i = numActivities - 1; i > 0; --i) {

            ActivityRecord target = activities.get(i);

            ActivityRecord target = activities.get(i);

            if (target.frontOfTask)

                break;





            final int flags = target.info.flags;

            final int flags = target.info.flags;

            boolean finishOnTaskLaunch = (flags & ActivityInfo.FLAG_FINISH_ON_TASK_LAUNCH) != 0;

            boolean finishOnTaskLaunch = (flags & ActivityInfo.FLAG_FINISH_ON_TASK_LAUNCH) != 0;