summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-10 23:26:00 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-10 23:26:00 (GMT)
commit07a485743ad170d5491383a8c5909ced14bb0930 (patch)
tree64407e1673c704cec02630fdd2e2083f8b2930d3
parent2256fd4e1113126bf85d0ee03197c1bd0f27e7bb (diff)
parenta7c959176c5abfcd402d5350661237b81dfac4ff (diff)
downloadframeworks_base-07a485743ad170d5491383a8c5909ced14bb0930.zip
frameworks_base-07a485743ad170d5491383a8c5909ced14bb0930.tar.gz
frameworks_base-07a485743ad170d5491383a8c5909ced14bb0930.tar.bz2
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev
* changes: [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c am: 0f19d41748 [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf Permission Check For DPM.getPermittedAccessibilityServices
-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 3c1cc83..9814689 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7767,6 +7767,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