From 3ad75d608dc55cb89329bf9d466af6f0f2e31631 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Mon, 18 Apr 2016 16:14:18 -0700
Subject: [PATCH] Properly resume paused activity when docked stack in
 maximized

Force focus to the fullscreen stack so that its activity is resumed
regardless of it current state when moving all tasks from the docked
stack to the fullscreen stack and the fullscreen stack should be on
top.

Bug: 28247643
Bug: 28196862
Change-Id: Ic60c3794db765e9ee31b0facbbc4f461d65f30c2
---
 .../java/com/android/server/am/ActivityStackSupervisor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index e91bb5c9866ab..b11b63769a811 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2076,7 +2076,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 {