diff options
| author | Eran Messeri <eranm@google.com> | 2019-04-10 17:35:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-10 17:35:21 -0700 |
| commit | 30826bd6587ec20e29d681148408da3fe9de5fdd (patch) | |
| tree | af223b35c11d8f31709dc20d29bdfbed3f90dc19 | |
| parent | 51fee974a96f6a3d1dd38822e52bd13a5fa46e03 (diff) | |
| parent | 07a485743ad170d5491383a8c5909ced14bb0930 (diff) | |
| download | base-30826bd6587ec20e29d681148408da3fe9de5fdd.tar.gz | |
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev
am: 07a485743a
Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 53b5eef5c82a..0b8263fd7be3 100644 --- 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 |