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

Commit 60a92520 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent mPendingTargetUserIds queue breaking when a switch fails." into main

parents 6e030fbb 24bd3c32

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

+1 −0
Original line number Diff line number Diff line
@@ -2318,6 +2318,7 @@ class UserController implements Handler.Callback { 
        synchronized (mLock) {

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

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

                mHandler.post(this::endUserSwitch);

                return true;

            }

            if (targetUserInfo == null) {