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

Commit bfa1a4d9 authored by Nikhil Kumar's avatar Nikhil Kumar Committed by Automerger Merge Worker
Browse files

Merge "Refactored switchUSer to handle user switch back to the current user"... 

Merge "Refactored switchUSer to handle user switch back to the current user" into udc-qpr-dev am: 58e26a57

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



Change-Id: I769dd0f0300f1048d4ee3911df898a7f98a138ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc39119 58e26a57

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

+18 −16
Original line number Diff line number Diff line
@@ -1928,7 +1928,9 @@ class UserController implements Handler.Callback { 
        EventLog.writeEvent(EventLogTags.UC_SWITCH_USER, targetUserId);

        int currentUserId = getCurrentUserId();

        UserInfo targetUserInfo = getUserInfo(targetUserId);

        if (targetUserId == currentUserId) {

        boolean userSwitchUiEnabled;

        synchronized (mLock) {

            if (targetUserId == currentUserId && mTargetUserId == UserHandle.USER_NULL) {

                Slogf.i(TAG, "user #" + targetUserId + " is already the current user");

                return true;

            }
@@ -1941,11 +1943,11 @@ class UserController implements Handler.Callback { 
                return false;

            }

            if (FactoryResetter.isFactoryResetting()) {

            Slogf.w(TAG, "Cannot switch to User #" + targetUserId + ": factory reset in progress");

                Slogf.w(TAG, "Cannot switch to User #" + targetUserId

                        + ": factory reset in progress");

                return false;

            }

        boolean userSwitchUiEnabled;

        synchronized (mLock) {



            if (!mInitialized) {

                Slogf.e(TAG, "Cannot switch to User #" + targetUserId

                        + ": UserController not ready yet");