summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:22 (GMT)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:22 (GMT)
commit39eef269bee8d4274d207704909adbe21eda278a (patch)
treec7c44bc4a20a2f9cfb8dc67a96209610a0baacb6
parent1bb102e37dce0a847f6201134cdfabc9f313dcb4 (diff)
parent4fd13eefcf99d9b9b0d5f5ea99fdc7c799c83d23 (diff)
downloadframeworks_base-39eef269bee8d4274d207704909adbe21eda278a.zip
frameworks_base-39eef269bee8d4274d207704909adbe21eda278a.tar.gz
frameworks_base-39eef269bee8d4274d207704909adbe21eda278a.tar.bz2
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
Change-Id: I45ff5ff42ee294967ae7e03329338abd49c94df4
-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 35bb819..c802a5f 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6882,6 +6882,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