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

Commit 84295be4 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

UM.isUserTypeEnabled @TestApi 

Make this API available for CTS tests. This way, for device-side tests,
you can tell tests to be skipped if their purpose involves creating a
profile for which the device isn't eligible anyway.

Test: N/A
Bug: 255793314
Bug: 255377177
Bug: 241298595
Bug: 257125968
Change-Id: I3a6d93f8092e327c9d6073e68e57d1eab2cfa127
parent 9d8f4ade

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1880,6 +1880,7 @@ package android.os { 
    method @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 public static boolean isSplitSystemUser();

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

    method public boolean isUsersOnSecondaryDisplaysSupported();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo preCreateUser(@NonNull String) throws android.os.UserManager.UserOperationException;

  }

core/java/android/os/UserManager.java

+1 −0
Original line number Diff line number Diff line
@@ -4339,6 +4339,7 @@ public class UserManager { 
     * @return true if the creation of users of the given user type is enabled on this device.

     * @hide

     */

    @TestApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS