commit a9a29f94dd5b94899f8a1560a84647b57910f9dd
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 14 22:23:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 14 22:23:46 2022 +0000
tree 56cd184280447e11421a9cb76724ae96cee593e7
parent 43148289e332657b6c27ba8b1937a06c6b00c9fd
parent 84295be403d65bf63a0b967f9fd27e9cc4b49ac9

Merge "UM.isUserTypeEnabled @TestApi"

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 535f6ce..cc4a71c 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1901,6 +1901,7 @@
     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

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 8aed2ac..fbfe548 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -4392,6 +4392,7 @@
      * @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