Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev

Browse Source 
* 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
This commit is contained in:
TreeHugger Robot
2019-04-10 23:26:00 +00:00
committed by Android (Google) Code Review
parent 2256fd4e11 a7c959176c
commit 07a485743a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -7767,6 +7767,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (!mHasFeature) { if (!mHasFeature) {
return null; return null;
} }
enforceManageUsers();
synchronized (this) { synchronized (this) {
List<String> result = null; List<String> result = null;
// If we have multiple profiles we return the intersection of the // If we have multiple profiles we return the intersection of the