summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:35 (GMT)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:35 (GMT)
commit75b579135c25b88c09d8b3bd18cfad6cda280446 (patch)
treeeea517e4f7090bf75e1e99cf5b169a5b9e4a4284
parent26fda936760bf81df5bc1282ceaf55528fb1756c (diff)
parent5d66886b4cd0c8df79ec59984a596e834da9d325 (diff)
downloadframeworks_base-75b579135c25b88c09d8b3bd18cfad6cda280446.zip
frameworks_base-75b579135c25b88c09d8b3bd18cfad6cda280446.tar.gz
frameworks_base-75b579135c25b88c09d8b3bd18cfad6cda280446.tar.bz2
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c
Change-Id: Ia4146b009e593ddda10c5878432533b3192c27d6
-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 f679e7a..2d4b914 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7050,6 +7050,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