Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev

This commit is contained in:
Sudheer Shanka
2016-07-29 21:50:32 +00:00
committed by Android (Google) Code Review

View File

@@ -284,7 +284,7 @@ public class UserManagerService extends IUserManager.Stub {
@Override @Override
public List<UserInfo> getProfiles(int userId, boolean enabledOnly) { public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {
if (userId != UserHandle.getCallingUserId()) { if (userId != UserHandle.getCallingUserId()) {
checkManageUsersPermission("getting profiles related to user " + userId); checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
} }
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
try { try {