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

2016-04-19 00:47:27 +00:00
parent 3e38e6accf 3ad75d608d
commit 84f0b791e2
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 {