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

Commit 1f537fa3 authored by Felipe Leme's avatar Felipe Leme
Browse files

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

This reverts commit 3ce9dab9.

Test: m update-api
Fixes: 438235209
Bug: 253528462
Bug: 438552312
Flag: EXEMPT re-adding removed @TestApi

Change-Id: Id0cba5f4873740db050e0a524e1ed7efb2016666
parent 82b0909c

core/api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -2665,6 +2665,7 @@ 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 @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, 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 @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 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 @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isUserTypeEnabled(@NonNull String);

    method public boolean isVisibleBackgroundUsersOnDefaultDisplaySupported();

    method public boolean isVisibleBackgroundUsersOnDefaultDisplaySupported();

core/java/android/os/UserManager.java

+19 −0
Original line number Original line Diff line number Diff line
@@ -5164,6 +5164,25 @@ 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

    @UnsupportedAppUsage

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS

    })

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

            boolean excludePreCreated) {

        return getUsers(excludeDying);

    }



    /**

    /**

     * Returns the user handles for all users on this device, based on the filtering parameters.

     * Returns the user handles for all users on this device, based on the filtering parameters.

     *

     *