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

Commit ec1cc163 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Requesting a new transition when user switches" into udc-dev am: 5102c26a am: 45abd1d5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23591105



Change-Id: I75094a644aae460e5d1edb222cb0ef06c0488357
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d72403f9 45abd1d5

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; 
import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;

import static android.view.WindowManager.REMOVE_CONTENT_MODE_UNDEFINED;

import static android.view.WindowManager.TRANSIT_NONE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.fixScale;

import static android.view.WindowManagerGlobal.ADD_OKAY;

import static android.view.WindowManagerGlobal.RELAYOUT_RES_CANCEL_AND_REDRAW;
@@ -3589,6 +3590,7 @@ public class WindowManagerService extends IWindowManager.Stub 


    public void setCurrentUser(@UserIdInt int newUserId) {

        synchronized (mGlobalLock) {

            mAtmService.getTransitionController().requestTransitionIfNeeded(TRANSIT_OPEN, null);

            mCurrentUserId = newUserId;

            mPolicy.setCurrentUserLw(newUserId);

            mKeyguardDisableHandler.setCurrentUser(newUserId);