diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1052d1dead87a..35f8402f71c8d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -18842,14 +18842,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { public List getPolicyManagedProfiles(@NonNull UserHandle user) { Preconditions.checkCallAuthorization(hasCallingOrSelfPermission( android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)); - int userId = user.getIdentifier(); return mInjector.binderWithCleanCallingIdentity(() -> { List userProfiles = mUserManager.getProfiles(userId); List 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;