From a107680e220a4cfa48d9fcecf2778763e7952b07 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Mon, 21 Mar 2022 19:36:09 +0000
Subject: [PATCH] Check the managed profile for PO

Fixes: 225938013
Test: manual
Test: CTS test to be added in a follow-up CL
Change-Id: Ic43bf774d89f89947f7377bae47b6dfbd1e62ea1
---
 .../server/devicepolicy/DevicePolicyManagerService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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<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;