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

Commit d52de071 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 cw-f-dev 

* changes:
  [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 40aa6e94 75b57913

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

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