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

Commit 1bf4ac35 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Doing nothing when switching to the foreground user"

parents e3eead55 58cbfafa

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

+4 −0
Original line number Diff line number Diff line
@@ -21610,6 +21610,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
        synchronized (this) {

            currentUserId = mUserController.getCurrentUserIdLocked();

            targetUserInfo = mUserController.getUserInfo(targetUserId);

            if (targetUserId == currentUserId) {

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

                return true;

            }

            if (targetUserInfo == null) {

                Slog.w(TAG, "No user info for user #" + targetUserId);

                return false;