From 299a01fc3cb92115aa1d1f5290198472661fc8e1 Mon Sep 17 00:00:00 2001 From: Matthew Ng Date: Mon, 5 Dec 2016 11:39:23 -0800 Subject: [PATCH] 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 --- .../java/com/android/server/am/ActivityStackSupervisor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index e3212c231d5df..dde948f2d6f94 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 @@ public class ActivityStackSupervisor extends ConfigurationContainer // 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.");