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

Merge "[ActivityManager] Move top task to top in window manager"

Browse Source
This commit is contained in:
Craig Mautner
2014-07-16 15:42:50 +00:00
committed by Gerrit Code Review
parent f9c79c63bc d937616f87
commit 7f4b420213
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1709,7 +1709,7 @@ public final class ActivityStackSupervisor {
TaskRecord sourceTask = sourceRecord.task; TaskRecord sourceTask = sourceRecord.task;
targetStack = sourceTask.stack; targetStack = sourceTask.stack;
moveHomeStack(targetStack.isHomeStack()); moveHomeStack(targetStack.isHomeStack());
mWindowManager.moveTaskToTop(sourceTask.taskId); mWindowManager.moveTaskToTop(targetStack.topTask().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