diff options
| author | 2016-04-05 17:21:42 +0100 | |
|---|---|---|
| committer | 2016-04-05 16:59:39 +0000 | |
| commit | 80189cdece046e2e915e07c0ee166b6375dbde84 (patch) | |
| tree | 28214ef3c813bbfd963cfd0bdb0e7c1ac81f8a35 | |
| parent | 434590405071b462573273637899599332c34187 (diff) | |
getProfiles should only returns non-partial user info
Bug: 26928524
Change-Id: I537bb0a9632cad603717a367b81d5e072452a6d7
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 3 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 90d500e53ab3..06a91fb0c857 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -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; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 37f2302cbac3..fb10031971e3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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 |