commit d7376d7b0e5ac6504938039c96d168bc75c024b6
author Sudheer Shanka <sudheersai@google.com> Fri Jul 29 10:50:10 2016 -0700
committer gitbuildkicker <android-build@google.com> Mon Aug 01 14:33:57 2016 -0700
tree d4bde0d56f2a7ee5a0265a89e944509b0e2583fb
parent e0a107eca59294b73e26ac12b7090c9e16dbabc4

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

Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 96d505b5d..583d764 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -301,7 +301,7 @@
     @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 {