From 80189cdece046e2e915e07c0ee166b6375dbde84 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Tue, 5 Apr 2016 17:21:42 +0100 Subject: [PATCH] getProfiles should only returns non-partial user info Bug: 26928524 Change-Id: I537bb0a9632cad603717a367b81d5e072452a6d7 --- .../core/java/com/android/server/pm/UserManagerService.java | 3 +++ .../server/devicepolicy/DevicePolicyManagerService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 90d500e53ab38..06a91fb0c8577 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 37f2302cbac3f..fb10031971e3c 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 admins = new ArrayList(); 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