drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ca903d38 to klp-modular-dev

Browse Source 
Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041
This commit is contained in:
Craig Mautner
2014-03-25 11:04:16 -07:00
parent 415e6f8ed4 ca903d3809
commit f32b22e9c7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@ -1753,6 +1753,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
TaskRecord sourceTask = sourceRecord.task; TaskRecord sourceTask = sourceRecord.task;
targetStack = sourceTask.stack; targetStack = sourceTask.stack;
targetStack.moveToFront(); targetStack.moveToFront();
mWindowManager.moveTaskToTop(sourceTask.taskId);
if (!addingToTask && if (!addingToTask &&
(launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
// In this case, we are adding the activity to an existing // In this case, we are adding the activity to an existing
@ -1808,6 +1809,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
r.setTask(prev != null ? prev.task r.setTask(prev != null ? prev.task
: targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true), : targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true),
null, true); null, true);
mWindowManager.moveTaskToTop(r.task.taskId);
if (DEBUG_TASKS) Slog.v(TAG, "Starting new activity " + r if (DEBUG_TASKS) Slog.v(TAG, "Starting new activity " + r
+ " in new guessed " + r.task); + " in new guessed " + r.task);
} }