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

Commit 5c879d9c authored by BK Choi's avatar BK Choi Committed by Automerger Merge Worker
Browse files

Merge "Make getAliveUsers() and getUsers() as @TestApi." into udc-dev am: 7c8d60cd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22995969



Change-Id: I8b045e89f14fc2e60473d88b52d70c3151be5b85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 909b2598 7c8d60cd

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2376,10 +2376,12 @@ package android.os { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createProfileForUser(@Nullable String, @NonNull String, int, int, @Nullable String[]);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getAliveUsers();

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

    method public int getMainDisplayIdAssignedToUser();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers();

    method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);

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

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isUserTypeEnabled(@NonNull String);

core/java/android/os/UserManager.java

+4 −3
Original line number Diff line number Diff line
@@ -4224,7 +4224,8 @@ public class UserManager { 
            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS

    })

    public List<UserInfo> getUsers() {

    @TestApi

    public @NonNull List<UserInfo> getUsers() {

        return getUsers(/*excludePartial= */ true, /* excludeDying= */ false,

                /* excludePreCreated= */ true);

    }
@@ -4245,6 +4246,7 @@ public class UserManager { 
            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS

    })

    @TestApi

    public @NonNull List<UserInfo> getAliveUsers() {

        return getUsers(/*excludePartial= */ true, /* excludeDying= */ true,

                /* excludePreCreated= */ true);
@@ -4271,8 +4273,7 @@ public class UserManager { 
     * Returns information for all users on this device, based on the filtering parameters.

     *

     * @deprecated Pre-created users are deprecated and no longer supported.

     *             Use {@link #getUsers()}, {@link #getUsers(boolean)}, or {@link #getAliveUsers()}

     *             instead.

     *             Use {@link #getUsers()}, or {@link #getAliveUsers()} instead.

     * @hide

     */

    @Deprecated