summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEran Messeri <eranm@google.com>2019-04-11 02:03:10 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2019-04-11 02:03:10 (GMT)
commitd89cac1562e8f35f1eef5003a4328189be625f22 (patch)
treec5ef311b1713f2544fe71ed7ae8d6ba62e3e059f
parent19ad060bf0f64bb9b863f00ef640e38ffeedad0b (diff)
parent30826bd6587ec20e29d681148408da3fe9de5fdd (diff)
downloadframeworks_base-d89cac1562e8f35f1eef5003a4328189be625f22.zip
frameworks_base-d89cac1562e8f35f1eef5003a4328189be625f22.tar.gz
frameworks_base-d89cac1562e8f35f1eef5003a4328189be625f22.tar.bz2
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev am: 07a485743a
am: 30826bd658 Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
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 68b078f..b0e06eb 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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