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

Commit 0e8cfe1e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25327380']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25327380'] into sparse-11084887-L36700030000358185.
SPARSE_CHANGE: Ia40cfacbee6fc174c90db8e3687838ae01e2858b

Change-Id: Id31878f5943ef7095df8d75cfae6297e58360979
parents 6ff78c36 5dd74cdf

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");