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

Commit 07c3b195 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'd543c3e1':
  [ActivityManager] Do not finish root activity when reset task
parents 3eb3b1d6 d543c3e1

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

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

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

            ActivityRecord target = activities.get(i);

            if (target.frontOfTask)

                break;



            final int flags = target.info.flags;

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

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

            ActivityRecord target = activities.get(i);

            if (target.frontOfTask)

                break;



            final int flags = target.info.flags;

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