diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-29 10:50:10 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-08-16 15:52:31 -0700 |
| commit | 43b5aa6bd6263e8ea87bda8f718eb3b080eed62b (patch) | |
| tree | 67b2e69473c8eb15b87999642f40e8540f1a7ad6 /services | |
| parent | d473effc7f81cef2a90d77c18c3fe33bbeb58c62 (diff) | |
| download | frameworks_base-43b5aa6bd6263e8ea87bda8f718eb3b080eed62b.zip frameworks_base-43b5aa6bd6263e8ea87bda8f718eb3b080eed62b.tar.gz frameworks_base-43b5aa6bd6263e8ea87bda8f718eb3b080eed62b.tar.bz2 | |
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index fd9979f..c5669cc 100644 --- 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 class UserManagerService extends IUserManager.Stub { @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 { |