commit a3915106420bc0e239f73c3eb9cad7de62902546
author Matthew Ng <ngmatthew@google.com> Mon Dec 05 11:39:23 2016 -0800
committer gitbuildkicker <android-build@google.com> Mon Dec 05 15:08:43 2016 -0800
tree 8ecfbc19a7bcb4b002a22c07bc1744d83f137e76
parent 467954b64376e2a588d27444e6673914d5eda6f8

Fixes recents from expanding full size when an app is docked

This is a bug as a result from change ag/1635318 where the
recents/overview area expands to full size when tapped after docking an
app by dragging it to the top. As a result it would expand to full size
and show behind the docked stack.

Fixes: 33335322
Test: ./run-test android.server.cts and ran manual use case from bug
Change-Id: Icf3443631fc3f1c3407d5fd23db077e47ba81110
(cherry picked from commit 299a01fc3cb92115aa1d1f5290198472661fc8e1)

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index e3212c2..dde948f 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -4599,13 +4599,13 @@
             // Defer updating the stack in which recents is until the app transition is done, to
             // not run into issues where we still need to draw the task in recents but the
             // docked stack is already created.
-            deferUpdateBounds(RECENTS_STACK_ID);
+            deferUpdateBounds(HOME_STACK_ID);
             mWindowManager.prepareAppTransition(TRANSIT_DOCK_TASK_FROM_RECENTS, false);
         }
 
         task = anyTaskForIdLocked(taskId, RESTORE_FROM_RECENTS, launchStackId);
         if (task == null) {
-            continueUpdateBounds(RECENTS_STACK_ID);
+            continueUpdateBounds(HOME_STACK_ID);
             mWindowManager.executeAppTransition();
             throw new IllegalArgumentException(
                     "startActivityFromRecentsInner: Task " + taskId + " not found.");