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

Commit 8c41a1c9 authored by Kenny Guy's avatar Kenny Guy
Browse files

Match non-crypto aware admins when registering. 

Profile owners are registered before the user is
started and unlocked, so we need to check for
components that aren't cryptoware when looking
for the admin.

Bug: 26924254
Change-Id: I61fca0a3d6e490ca6fea9a7bdc8f2c44efde74f2
parent e578f454

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);