Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "getUserPropertiesCopy handles Query/Manage perms"

Browse Source
This commit is contained in:
Adam Bookatz
2022-10-24 18:14:47 +00:00
committed by Android (Google) Code Review
parent e05e9da6bb 6d410f10e8
commit 9bdbc5786d
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/content/pm/UserProperties.java
View File

@@ -114,7 +114,7 @@ public final class UserProperties implements Parcelable {
public UserProperties(UserProperties orig,
boolean exposeAllFields,
boolean hasManagePermission,
boolean hasQueryPermission) {
boolean hasQueryOrManagePermission) {
if (orig.mDefaultProperties == null) {
throw new IllegalArgumentException("Attempting to copy a non-original UserProperties.");
@@ -122,17 +122,19 @@ public final class UserProperties implements Parcelable {
this.mDefaultProperties = null;
// Insert each setter into the following hierarchy based on its permission requirements.
// NOTE: Copy each property using getters to ensure default values are copied if needed.
if (exposeAllFields) {
// Add items that require exposeAllFields to be true (strictest permission level).
setStartWithParent(orig.getStartWithParent());
}
if (hasManagePermission) {
// Add any items that require this permission.
// Add items that require MANAGE_USERS or stronger.
}
if (hasQueryPermission) {
// Add any items that require this permission.
if (hasQueryOrManagePermission) {
// Add items that require QUERY_USERS or stronger.
}
// Add any items that require no permissions at all.
// Add items that have no permission requirements at all.
setShowInLauncher(orig.getShowInLauncher());
}

7
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1540,10 +1540,9 @@ public class UserManagerService extends IUserManager.Stub {
checkQueryOrInteractPermissionIfCallerInOtherProfileGroup(userId, "getUserProperties");
final UserProperties origProperties = getUserPropertiesInternal(userId);
if (origProperties != null) {
int callingUid = Binder.getCallingUid();
boolean exposeAllFields = callingUid == Process.SYSTEM_UID;
boolean hasManage = hasPermissionGranted(Manifest.permission.MANAGE_USERS, callingUid);
boolean hasQuery = hasPermissionGranted(Manifest.permission.QUERY_USERS, callingUid);
boolean exposeAllFields = Binder.getCallingUid() == Process.SYSTEM_UID;
boolean hasManage = hasManageUsersPermission();
boolean hasQuery = hasQueryUsersPermission();
return new UserProperties(origProperties, exposeAllFields, hasManage, hasQuery);
}
// A non-existent or partial user will reach here.