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

1 files changed, 4 insertions, 0 deletions

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 8f777f9cbfad..3d66d8458b85 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -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;