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

Commit 5183933b authored by Leo Hsu's avatar Leo Hsu
Browse files

Update UserManager APIs to follow API guidelines. 

Annotate @Nullable/@NonNull to arguments and return values.

Bug: 126700763
Test: Manually
Change-Id: I3cce7c4a6751240b64c0dbb6ee627579cdaf63be
parent a7246835

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -5587,7 +5587,7 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountType();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public long[] getSerialNumbersOfUsers(boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.graphics.Bitmap getUserIcon();

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.graphics.Bitmap getUserIcon();

    method @Deprecated @android.os.UserManager.UserRestrictionSource @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public int getUserRestrictionSource(String, android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserManager.EnforcingUser> getUserRestrictionSources(String, android.os.UserHandle);

    method public boolean hasRestrictedProfiles();
@@ -5598,8 +5598,8 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isPrimaryUser();

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

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

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

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserName(String);

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

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserName(@Nullable String);

    field public static final String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";

    field @Deprecated public static final String DISALLOW_OEM_UNLOCK = "no_oem_unlock";

    field public static final String DISALLOW_RUN_IN_BACKGROUND = "no_run_in_background";

core/java/android/os/UserManager.java

+3 −3
Original line number Diff line number Diff line
@@ -2705,7 +2705,7 @@ public class UserManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public void setUserName(String name) {

    public void setUserName(@Nullable String name) {

        setUserName(getUserHandle(), name);

    }
@@ -2732,7 +2732,7 @@ public class UserManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public void setUserIcon(Bitmap icon) {

    public void setUserIcon(@NonNull Bitmap icon) {

        setUserIcon(getUserHandle(), icon);

    }
@@ -2772,7 +2772,7 @@ public class UserManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public Bitmap getUserIcon() {

    public @Nullable Bitmap getUserIcon() {

        return getUserIcon(getUserHandle());

    }