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

Commit 87c84a00 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 nyc-dr1-dev 

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eef
  Permission Check For DPM.getPermittedAccessibilityServices
parents 8bee19ca 39eef269

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

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