Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in getProfileOwnerAdminsForCurrentProfileGroup"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-08 16:43:14 +00:00
committed by Android (Google) Code Review
parent 2d1ce374af d59513f9ec
commit e13ef94a6a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

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