commit f01ee1c291665ed4b79c5966b19e3972d46ffd31
author Sudheer Shanka <sudheersai@google.com> Sat Jul 30 05:08:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 30 05:08:35 2016 +0000
tree fac43ee4e0e1de785c14f6eeeef94259651175a7
parent b8d3dd2472623bde61aa495eab8407a50a26ff52
parent 9f6bd40108191462bf0d5e2205b35a46cbd74a3f

DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e
am: 9f6bd40108

Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573

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 d9a1dd9..373b8c4 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -284,7 +284,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 {