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

Merge "Don't return self if not a profile"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-26 03:57:40 +00:00
committed by Android (Google) Code Review
parent f4948726d9 801e342faa
commit d1b6dcbea6
2 changed files with 4 additions and 2 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

@@ -716,7 +716,7 @@ public class UserManagerService extends IUserManager.Stub {
return null;
}
int parentUserId = profile.profileGroupId;
if (parentUserId == UserInfo.NO_PROFILE_GROUP_ID) {
if (parentUserId == userHandle || parentUserId == UserInfo.NO_PROFILE_GROUP_ID) {
return null;
} else {
return getUserInfoLU(parentUserId);

4
services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
View File

@@ -177,10 +177,12 @@ public class UserManagerTest extends AndroidTestCase {
UserInfo userInfo = createProfileForUser("Profile",
UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
assertNotNull(userInfo);
assertNull(mUserManager.getProfileParent(primaryUserId));
UserInfo parentProfileInfo = mUserManager.getProfileParent(userInfo.id);
assertNotNull(parentProfileInfo);
assertEquals(parentProfileInfo.id, primaryUserId);
removeUser(userInfo.id);
assertNull(mUserManager.getProfileParent(primaryUserId));
}
// Make sure only one managed profile can be created