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

Commit bdfd6368 authored by Eric Sandness's avatar Eric Sandness Committed by android-build-merger
Browse files

Merge "Permission Check For DPM.getPermittedAccessibilityServices" into pi-dev 

am: 0997a325

Change-Id: I73acdc186de59877a558c5ad464f504c47a28bce
parents 1a1ff74b 0997a325

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -6198,6 +6198,7 @@ public class DevicePolicyManager { 
     * @hide

     */

     @SystemApi

     @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

     public @Nullable List<String> getPermittedAccessibilityServices(int userId) {

        throwIfParentInstance("getPermittedAccessibilityServices");

        if (mService != null) {

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

+1 −0
Original line number Diff line number Diff line
@@ -8481,6 +8481,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        if (!mHasFeature) {

            return null;

        }

        enforceManageUsers();

        synchronized (getLockObject()) {

            List<String> result = null;

            // If we have multiple profiles we return the intersection of the