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

Sudheer Shanka · gitbuildkicker · commit 43b5aa6bd626 · 2016-08-16T15:52:31.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
@@ -296,7 +296,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
`@@ -296,7 +296,7 @@ public List<UserInfo> getUsers(boolean excludeDying) {`
`296`	`296`	`@Override`
`297`	`297`	`public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {`
`298`	`298`	`if (userId != UserHandle.getCallingUserId()) {`
`299`		`- checkManageUsersPermission("getting profiles related to user " + userId);`
	`299`	`+ checkManageOrCreateUsersPermission("getting profiles related to user " + userId);`
`300`	`300`	`}`
`301`	`301`	`final long ident = Binder.clearCallingIdentity();`
`302`	`302`	`try {`