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

Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."

Browse Source
This commit is contained in:
Craig Mautner
2014-03-28 20:23:34 +00:00
committed by Gerrit Code Review
parent 49c061501d 739e194121
commit ff3362f0d8
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityStackSupervisor.java Normal file → Executable file
View File

@@ -1425,6 +1425,7 @@ public final class ActivityStackSupervisor {
r.resultTo = null; r.resultTo = null;
} }
boolean switchStackFromBg = false;
boolean addingToTask = false; boolean addingToTask = false;
boolean movedHome = false; boolean movedHome = false;
TaskRecord reuseTask = null; TaskRecord reuseTask = null;
@@ -1486,6 +1487,11 @@ public final class ActivityStackSupervisor {
} }
options = null; options = null;
} }
} else {
switchStackFromBg = lastStack != targetStack;
if (DEBUG_TASKS) Slog.d(TAG, "Caller " + sourceRecord
+ " is not top task, it may not move " + r
+ " to front, switchStack=" + switchStackFromBg);
} }
// If the caller has requested that the target task be // If the caller has requested that the target task be
// reset, then do so. // reset, then do so.
@@ -1593,6 +1599,10 @@ public final class ActivityStackSupervisor {
// don't use that intent!) And for paranoia, make // don't use that intent!) And for paranoia, make
// sure we have correctly resumed the top activity. // sure we have correctly resumed the top activity.
if (doResume) { if (doResume) {
if (switchStackFromBg) {
moveHomeStack(lastStack.isHomeStack());
targetStack = lastStack;
}
targetStack.resumeTopActivityLocked(null, options); targetStack.resumeTopActivityLocked(null, options);
} else { } else {
ActivityOptions.abort(options); ActivityOptions.abort(options);