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

getProfiles should only returns non-partial user info

Browse Source 
Bug: 26928524
Change-Id: I537bb0a9632cad603717a367b81d5e072452a6d7
This commit is contained in:
Tony Mak
2016-04-05 17:21:42 +01:00
parent 4345904050
commit 80189cdece
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,6 +500,9 @@ public class UserManagerService extends IUserManager.Stub {
if (mRemovingUserIds.get(profile.id)) {
continue;
}
if (profile.partial) {
continue;
}
users.add(userWithName(profile));
}
return users;

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3006,7 +3006,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
ArrayList<ActiveAdmin> admins = new ArrayList<ActiveAdmin>();
for (UserInfo userInfo : mUserManager.getProfiles(userHandle)) {
DevicePolicyData policy = getUserData(userInfo.id);
if (!isManagedProfile(userInfo.id)) {
if (!userInfo.isManagedProfile()) {
admins.addAll(policy.mAdminList);
} else {
// For managed profiles, we always include the policies set on the parent