diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-16 15:46:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-15 20:36:09 +0000 |
| commit | d543c3e113ffa82a63669feca540ca2e10b1576f (patch) | |
| tree | b9407dcdd82f1cfa2b47f63c115cc73ae104b4b6 | |
| parent | 7f4b4202130620edf385b7544e1358c589ee69d2 (diff) | |
| parent | f87b21953947f2fda8ac960c458dc7395ef90bbb (diff) | |
| download | frameworks_base-d543c3e113ffa82a63669feca540ca2e10b1576f.zip frameworks_base-d543c3e113ffa82a63669feca540ca2e10b1576f.tar.gz frameworks_base-d543c3e113ffa82a63669feca540ca2e10b1576f.tar.bz2 | |
Merge "[ActivityManager] Do not finish root activity when reset task"
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 4 |
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 8f777f9..3d66d84 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; |