Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a48574 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef am: 39eef269 am: 5d66886b am: 75b57913 am: 0f19d417
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef am: 39eef269 am: 5d66886b am: 75b57913
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef am: 39eef269 am: 5d66886b
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef am: 39eef269
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef
  Permission Check For DPM.getPermittedAccessibilityServices
parents 2256fd4e a7c95917

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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