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

Commit 91027f85 authored by Jeffrey Huang's avatar Jeffrey Huang
Browse files

Add UserManager#getUserHandles() as SystemApi 

Bug: 144953136
Test: atest UserManagerTest
Change-Id: I32965b9dc090c5686adb7e499fff022c7193c504
parent a11e1ce8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5857,6 +5857,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 @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserHandle> getUserHandles(boolean);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) 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);

core/java/android/os/UserManager.java

+33 −15
Original line number Diff line number Diff line
@@ -2707,6 +2707,21 @@ public class UserManager { 
        return getUsers(/* excludeDying= */ false);

    }



    /**

     * Returns information for all users on this device. Requires

     * {@link android.Manifest.permission#MANAGE_USERS} permission.

     *

     * @param excludeDying specify if the list should exclude users being

     *            removed.

     * @return the list of users that were created.

     * @hide

     */

    @UnsupportedAppUsage

    public @NonNull List<UserInfo> getUsers(boolean excludeDying) {

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

                /* excludePreCreated= */ true);

    }



    /**

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

     *
@@ -2722,6 +2737,24 @@ public class UserManager { 
        }

    }



    /**

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

     *

     * @param excludeDying specify if the list should exclude users being removed.

     * @return the list of user handles.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public @NonNull List<UserHandle> getUserHandles(boolean excludeDying) {

        List<UserInfo> users = getUsers(excludeDying);

        List<UserHandle> result = new ArrayList<>(users.size());

        for (UserInfo user : users) {

            result.add(user.getUserHandle());

        }

        return result;

    }



    /**

     * Returns serial numbers of all users on this device.

     *
@@ -3261,21 +3294,6 @@ public class UserManager { 
        }

    }



    /**

     * Returns information for all users on this device. Requires

     * {@link android.Manifest.permission#MANAGE_USERS} permission.

     *

     * @param excludeDying specify if the list should exclude users being

     *            removed.

     * @return the list of users that were created.

     * @hide

     */

    @UnsupportedAppUsage

    public @NonNull List<UserInfo> getUsers(boolean excludeDying) {

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

                /* excludePreCreated= */ true);

    }



    /**

     * Removes a user and all associated data.

     * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+15 −0
Original line number Diff line number Diff line
@@ -703,6 +703,21 @@ public class UserManagerTest extends AndroidTestCase { 
        assertEquals(canBeCreatedCount, created.get());

    }



    @MediumTest

    public void testGetUserHandles_createNewUser_shouldFindNewUser() {

        UserInfo user = createUser("Guest 1", UserManager.USER_TYPE_FULL_GUEST, /*flags*/ 0);



        boolean found = false;

        List<UserHandle> userHandles = mUserManager.getUserHandles(/* excludeDying= */ true);

        for (UserHandle userHandle: userHandles) {

            if (userHandle.getIdentifier() == user.id) {

                found = true;

            }

        }



        assertTrue(found);

    }



    private boolean isPackageInstalledForUser(String packageName, int userId) {

        try {

            return mPackageManager.getPackageInfoAsUser(packageName, 0, userId) != null;