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

Commit e13ef94a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in getProfileOwnerAdminsForCurrentProfileGroup"

parents 2d1ce374 d59513f9

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

+4 −2
Original line number Diff line number Diff line
@@ -14584,8 +14584,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            for (int i = 0; i < users.length; i++) {

                final ComponentName componentName = getProfileOwner(users[i]);

                if (componentName != null) {

                    admins.add(getActiveAdminForCallerLocked(

                            componentName, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER));

                    ActiveAdmin admin = getActiveAdminUncheckedLocked(componentName, users[i]);

                    if (admin != null) {

                        admins.add(admin);

                    }

                }

            }

            return admins;