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

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev am: 07a485743a

Browse Source 
am: 30826bd658

Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c
This commit is contained in:
Eran Messeri
2019-04-10 19:03:10 -07:00
committed by android-build-merger
parent 19ad060bf0 30826bd658
commit d89cac1562
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7804,6 +7804,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
enforceManageUsers();
synchronized (this) { synchronized (this) {
List<String> result = null; List<String> result = null;
// If we have multiple profiles we return the intersection of the // If we have multiple profiles we return the intersection of the