Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0490ff2 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "getProfiles should only returns non-partial user info" into nyc-dev 

am: 73ebf33d

* commit '73ebf33d':
  getProfiles should only returns non-partial user info

Change-Id: I25fe20297bf83094c3b09c8784365546c14cb2ed
parents eadb88fe 73ebf33d

services/core/java/com/android/server/pm/UserManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,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