diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 13246ba9e587d..6c2d14e62f0b7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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;