Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow apps with CREATE_USERS permission to call UM.getProfiles." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-07-29 21:50:39 +00:00
committed by Android (Google) Code Review
parent 06c1159b0a 7468091329
commit b7c3ae1a86
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -548,7 +548,7 @@ public class UserManagerService extends IUserManager.Stub {
public List<UserInfo> getProfiles(int userId, boolean enabledOnly) { public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {
boolean returnFullInfo = true; boolean returnFullInfo = true;
if (userId != UserHandle.getCallingUserId()) { if (userId != UserHandle.getCallingUserId()) {
checkManageUsersPermission("getting profiles related to user " + userId); checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
} else { } else {
returnFullInfo = hasManageUsersPermission(); returnFullInfo = hasManageUsersPermission();
} }