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

Commit 866e977d 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: I0dba44a6867994a505320ea2a62f360f8b4adb20
parents 26d11a0a e235e7f5

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

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

    public List<UserHandle> getPolicyManagedProfiles(@NonNull UserHandle user) {

        Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(

        Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(

                android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS));

                android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS));














        int userId = user.getIdentifier();







        int userId = user.getIdentifier();











        return mInjector.binderWithCleanCallingIdentity(() -> {







        return mInjector.binderWithCleanCallingIdentity(() -> {











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







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











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







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











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







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











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







                UserInfo userInfo = userProfiles.get(i);











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







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














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











                }







                }











            }







            }











            return result;







            return result;