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

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

Merge "UserController.switchUser accepts MANAGE_USERS"

parents 70307c53 adf85dac

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -1342,7 +1342,6 @@ class UserController implements Handler.Callback { 
    }

    }





    boolean switchUser(final int targetUserId) {

    boolean switchUser(final int targetUserId) {

        checkCallingPermission(INTERACT_ACROSS_USERS_FULL, "switchUser");

        enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, targetUserId);

        enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, targetUserId);

        int currentUserId = getCurrentUserId();

        int currentUserId = getCurrentUserId();

        UserInfo targetUserInfo = getUserInfo(targetUserId);

        UserInfo targetUserInfo = getUserInfo(targetUserId);