summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kholoud mohamed <kholoudm@google.com> 2020-01-08 12:03:30 +0000
committer kholoud mohamed <kholoudm@google.com> 2020-01-08 12:10:01 +0000
commitd59513f9ec2f512f1c69c1ef4fccef9975a37095 (patch)
treea91a8f92575e1accab850b9d7247796204020cf5
parentf8ac43edaba35e0d5616f55a2de607216cbb84e7 (diff)
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
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java6
1 files 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 881ab8aa805e..79e2fd023a8f 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;