Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev

am: 84f0b791e2 * commit '84f0b791e2eb0170c6b797929235c98d44f12d47': Properly resume paused activity when docked stack in maximized Change-Id: I62c0afa5fc227b543dc2f2ee9c77ac6ed1a33138
2016-04-19 00:51:14 +00:00
parent 836bc0738c 84f0b791e2
commit 942157d63a
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2120,7 +2120,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
            if (onTop) {
                for (int i = 0; i < size; i++) {
                    moveTaskToStackLocked(tasks.get(i).taskId,
-                            FULLSCREEN_WORKSPACE_STACK_ID, onTop, !FORCE_FOCUS,
+                            FULLSCREEN_WORKSPACE_STACK_ID, onTop, onTop /*forceFocus*/,
                            "moveTasksToFullscreenStack", ANIMATE);
                }
            } else {