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

am: 07a485743a Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6
2019-04-10 17:35:21 -07:00
parent 51fee974a9 07a485743a
commit 30826bd658
1 changed files with 1 additions and 0 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7798,6 +7798,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