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

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

View File

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