diff options
| author | Adam Bookatz <bookatz@google.com> | 2022-03-22 02:33:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-22 02:33:54 +0000 |
| commit | 56996833f73650ae7069bd2a16a2b33151c6b2a5 (patch) | |
| tree | 52ca63c87f94f7b6965a99a66ed60547d2a08e28 /core/java/android/os/UserManager.java | |
| parent | 72fbb77539251df7f836493510897a6911372ea3 (diff) | |
| parent | 48f7d7f05605378cd24ff061f72a60e10461f40d (diff) | |
Merge "Relax permissions for isUserOfType, isUserNameSet" into tm-dev
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 608c424451b7..c4cb3195e485 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2186,9 +2186,17 @@ public class UserManager { * @hide */ @SystemApi - @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, - Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) - @UserHandleAware(enabledSinceTargetSdkVersion = Build.VERSION_CODES.TIRAMISU) + @RequiresPermission(anyOf = { + android.Manifest.permission.MANAGE_USERS, + android.Manifest.permission.CREATE_USERS, + android.Manifest.permission.QUERY_USERS, + android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) + @UserHandleAware( + enabledSinceTargetSdkVersion = Build.VERSION_CODES.TIRAMISU, + requiresAnyOfPermissionsIfNotCaller = { + android.Manifest.permission.MANAGE_USERS, + android.Manifest.permission.CREATE_USERS, + android.Manifest.permission.QUERY_USERS}) public boolean isUserNameSet() { try { return mService.isUserNameSet(getContextUserIfAppropriate()); @@ -2292,8 +2300,11 @@ public class UserManager { * @hide */ @SystemApi + @RequiresPermission(anyOf = { + android.Manifest.permission.MANAGE_USERS, + android.Manifest.permission.CREATE_USERS, + android.Manifest.permission.QUERY_USERS}) @UserHandleAware - @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isUserOfType(@NonNull String userType) { try { return mService.isUserOfType(mUserId, userType); |