summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:41 (GMT)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-26 10:13:41 (GMT)
commit0f19d41748076958f2c54e6bed265fa149c44112 (patch)
treed1753411daf1e45b28e627baab20355a4999d1fa
parentcf76183e6c041fdbfe4e9c0c0ff3ead821e0cb5b (diff)
parent75b579135c25b88c09d8b3bd18cfad6cda280446 (diff)
downloadframeworks_base-0f19d41748076958f2c54e6bed265fa149c44112.zip
frameworks_base-0f19d41748076958f2c54e6bed265fa149c44112.tar.gz
frameworks_base-0f19d41748076958f2c54e6bed265fa149c44112.tar.bz2
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c
Change-Id: I62d3f4b0d7f00b2f15003fa176d4758599dc2353
-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 6de92d7..6067ae7 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7122,6 +7122,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