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

Commit c5947f8b authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Match non-crypto aware admins when registering."

parents 5aaac015 8c41a1c9

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

+2 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        resolveIntent.setComponent(adminName);

        List<ResolveInfo> infos = mContext.getPackageManager().queryBroadcastReceiversAsUser(

                resolveIntent,

                PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,

                PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |

                PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,

                userHandle);

        if (infos == null || infos.size() <= 0) {

            throw new IllegalArgumentException("Unknown admin: " + adminName);