Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-07-16 15:46:30 +00:00
committed by Gerrit Code Review
parent 7f4b420213 f87b219539
commit d543c3e113
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -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;