diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-29 10:50:10 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-08-01 14:25:25 -0700 |
commit | 90ea10c4d3e4aceba98276f5f16389aa6f99584a (patch) | |
tree | 40f2ced7441348e9df9c68f17d3318cefd668e31 /services/core | |
parent | 5aa2601ddd7c52b740cdffdeb8afd22d0151b1d5 (diff) | |
download | frameworks_base-90ea10c4d3e4aceba98276f5f16389aa6f99584a.zip frameworks_base-90ea10c4d3e4aceba98276f5f16389aa6f99584a.tar.gz frameworks_base-90ea10c4d3e4aceba98276f5f16389aa6f99584a.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/core')
-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 96d505b..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 @@ 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 { |