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

Merge "Add getProfileParentId (1/2)"

Browse Source
This commit is contained in:
Jakub Pawlowski
2017-11-17 01:33:31 +00:00
committed by Gerrit Code Review
parent 12bc5b6289 0f1f5b7953
commit 7a2c66359a
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/IUserManager.aidl
View File

@@ -35,6 +35,10 @@ interface IUserManager {
* DO NOT MOVE - UserManager.h depends on the ordering of this function. * DO NOT MOVE - UserManager.h depends on the ordering of this function.
*/ */
int getCredentialOwnerProfile(int userHandle); int getCredentialOwnerProfile(int userHandle);
int getProfileParentId(int userHandle);
/*
* END OF DO NOT MOVE
*/
UserInfo createUser(in String name, int flags); UserInfo createUser(in String name, int flags);
UserInfo createProfileForUser(in String name, int flags, int userHandle, UserInfo createProfileForUser(in String name, int flags, int userHandle,

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

@@ -714,6 +714,19 @@ public class UserManagerService extends IUserManager.Stub {
} }
} }
@Override
public int getProfileParentId(int userHandle) {
checkManageUsersPermission("get the profile parent");
synchronized (mUsersLock) {
UserInfo profileParent = getProfileParentLU(userHandle);
if (profileParent == null) {
return userHandle;
}
return profileParent.id;
}
}
private UserInfo getProfileParentLU(int userHandle) { private UserInfo getProfileParentLU(int userHandle) {
UserInfo profile = getUserInfoLU(userHandle); UserInfo profile = getUserInfoLU(userHandle);
if (profile == null) { if (profile == null) {