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

Commit 901f69af authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Check the managed profile for PO" into tm-dev am: e235e7f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17298044

Change-Id: I29dd5dfef4a65beb26faf413261b3ea15a8a3355
parents 922ca58b e235e7f5

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

+3 −3
Original line number Diff line number Diff line
@@ -18842,14 +18842,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    public List<UserHandle> getPolicyManagedProfiles(@NonNull UserHandle user) {

        Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(

                android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS));















        int userId = user.getIdentifier();















        return mInjector.binderWithCleanCallingIdentity(() -> {















            List<UserInfo> userProfiles = mUserManager.getProfiles(userId);















            List<UserHandle> result = new ArrayList<>();















            for (int i = 0; i < userProfiles.size(); i++) {













                if (userProfiles.get(i).isManagedProfile() && hasProfileOwner(userId)) {













                    result.add(new UserHandle(userProfiles.get(i).id));













                UserInfo userInfo = userProfiles.get(i);













                if (userInfo.isManagedProfile() && hasProfileOwner(userInfo.id)) {













                    result.add(new UserHandle(userInfo.id));















                }















            }















            return result;