DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.

Sudheer Shanka · gitbuildkicker · commit 90ea10c4d3e4 · 2016-08-01T14:25:25.000-07:00
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -301,7 +301,7 @@ public List<UserInfo> getUsers(boolean excludeDying) {
     @Override
     public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {
         if (userId != UserHandle.getCallingUserId()) {
-            checkManageUsersPermission("getting profiles related to user " + userId);
+            checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
         }
         final long ident = Binder.clearCallingIdentity();
         try {

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public List<UserInfo> getUsers(boolean excludeDying) {`
`301`	`301`	`@Override`
`302`	`302`	`public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {`
`303`	`303`	`if (userId != UserHandle.getCallingUserId()) {`
`304`		`- checkManageUsersPermission("getting profiles related to user " + userId);`
	`304`	`+ checkManageOrCreateUsersPermission("getting profiles related to user " + userId);`
`305`	`305`	`}`
`306`	`306`	`final long ident = Binder.clearCallingIdentity();`
`307`	`307`	`try {`