Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b23a51 authored by Winson Chung's avatar Winson Chung
Browse files

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
parent 2ddcb077

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

+4 −0
Original line number Diff line number Diff line
@@ -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);