From d59513f9ec2f512f1c69c1ef4fccef9975a37095 Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Wed, 8 Jan 2020 12:03:30 +0000
Subject: [PATCH] Fix bug in getProfileOwnerAdminsForCurrentProfileGroup

Fixing a bug in ag/9885696.
Changed to get the active admin for the current user rather
than the calling user.

BUG: 136249261
Test: atest CrossProfileAppsPermissionHostSideTest
Change-Id: I847056b4dbca215438a9856c456d6042ea4fa891
---
 .../server/devicepolicy/DevicePolicyManagerService.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 881ab8aa805e8..79e2fd023a8fa 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -14551,8 +14551,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;