diff options
| author | 2019-04-10 23:26:01 +0000 | |
|---|---|---|
| committer | 2019-04-10 23:26:01 +0000 | |
| commit | 3f1d0ccd2df36c3818c5adb7112463501a4a0b64 (patch) | |
| tree | 81d1a1a53dd3083ce50d32c0b7f14e050b2571ad | |
| parent | d50021f86b2e7116320bec3e16bcf6fa42873a65 (diff) | |
| parent | 5d66886b4cd0c8df79ec59984a596e834da9d325 (diff) | |
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr1-dev
* changes:
[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.java | 1 |
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 4df1a14077ca..33d7c9313d10 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7014,6 +7014,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 |