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

Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041

Browse Source 
Change-Id: I509b6d1568e2cba4d54a218a63509a6e9ffee418
This commit is contained in:
Automerger Merge Worker
2020-02-28 16:09:37 +00:00
parent 04a79624d9 20905ec041
commit 04fadaadeb
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4674,6 +4674,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return getUserDataUnchecked(userHandle).mAdminList; return getUserDataUnchecked(userHandle).mAdminList;
} }
ArrayList<ActiveAdmin> admins = new ArrayList<>(); ArrayList<ActiveAdmin> admins = new ArrayList<>();
mInjector.binderWithCleanCallingIdentity(() -> {
for (UserInfo userInfo : mUserManager.getProfiles(userHandle)) { for (UserInfo userInfo : mUserManager.getProfiles(userHandle)) {
DevicePolicyData policy = getUserDataUnchecked(userInfo.id); DevicePolicyData policy = getUserDataUnchecked(userInfo.id);
if (userInfo.id == userHandle) { if (userInfo.id == userHandle) {
@@ -4690,6 +4691,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Slog.w(LOG_TAG, "Unknown user type: " + userInfo); Slog.w(LOG_TAG, "Unknown user type: " + userInfo);
} }
} }
});
return admins; return admins;
} }