From c2b23a511425a4ac871fd16cbb1271b2f331e6d0 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 9 Jan 2017 15:44:55 -0800 Subject: [PATCH] Remove pinned stack when switching users. - Make behavior consistent for both docked and pinned stacks when switching users. Test: Enter PIP, switch users Change-Id: Ia4a86560dbf9f977fd72f5f9b443b508cea4a2d1 --- .../java/com/android/server/am/ActivityStackSupervisor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 5def3403dc569..8bd7c90101819 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3335,6 +3335,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D final int focusStackId = mFocusedStack.getStackId(); // We dismiss the docked stack whenever we switch users. moveTasksToFullscreenStackLocked(DOCKED_STACK_ID, focusStackId == DOCKED_STACK_ID); + // Also dismiss the pinned stack whenever we switch users. Removing the pinned stack will + // also cause all tasks to be moved to the fullscreen stack at a position that is + // appropriate. + removeStackLocked(PINNED_STACK_ID); mUserStackInFront.put(mCurrentUser, focusStackId); final int restoreStackId = mUserStackInFront.get(userId, HOME_STACK_ID);