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

Commit 7fc60391 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "UM.isUserNameSet is SystemApi"

parents 45b6ecc1 fe4eb2b1

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6816,6 +6816,7 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isSameProfileGroup(@NonNull android.os.UserHandle, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public boolean isUserNameSet();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isUserUnlockingOrUnlocked(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean removeUser(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserIcon(@NonNull android.graphics.Bitmap);

core/java/android/os/UserManager.java

+3 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,9 @@ public class UserManager { 
     * set by the user and is not a placeholder string provided by the system.

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,

            Manifest.permission.GET_ACCOUNTS_PRIVILEGED})

    public boolean isUserNameSet() {

        try {

            return mService.isUserNameSet(getUserHandle());

services/core/java/com/android/server/pm/UserManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -3977,6 +3977,10 @@ public class UserManagerService extends IUserManager.Stub { 


    @Override

    public boolean isUserNameSet(@UserIdInt int userId) {

        if (!hasManageUsersOrPermission(android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED)) {

            throw new SecurityException("You need MANAGE_USERS or GET_ACCOUNTS_PRIVILEGED "

                    + "permissions to: get whether user name is set");

        }

        synchronized (mUsersLock) {

            final UserInfo userInfo = getUserInfoLU(userId);

            return userInfo != null && userInfo.name != null;