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

Commit 3ce9dab9 authored by Felipe Leme's avatar Felipe Leme
Browse files

Hide deprecated UserManager.getUsers(boolean, boolean, boolean) 

It was added to include pre-created users (3rd parameter), which is
deprecated; this CL makes it private, and future CLs will completely
remove it.

Test: m -j update-api # it was a TestingApi
Test: build and flash
Flag: EXEMPT cleaning up deprecated code
Bug: 253528462

Change-Id: Id0cba5f4873740db050e0a524e1ed7efb2016f10
parent f23e3481

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2636,7 +2636,6 @@ package android.os { 
    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);

    method public boolean isVisibleBackgroundUsersOnDefaultDisplaySupported();

core/java/android/os/UserManager.java

+1 −4
Original line number Diff line number Diff line
@@ -5106,19 +5106,16 @@ 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()}, or {@link #getAliveUsers()} instead.

     * @hide

     */

    @Deprecated

    @TestApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS

    })

    public @NonNull List<UserInfo> getUsers(boolean excludePartial, boolean excludeDying,

    private @NonNull List<UserInfo> getUsers(boolean excludePartial, boolean excludeDying,

            boolean excludePreCreated) {

        try {

            return mService.getUsers(excludePartial, excludeDying, excludePreCreated);