commit c5947f8b761b7f5ec2b788f56b1c21ee742c6c25
author Kenny Guy <kennyguy@google.com> Wed Feb 03 17:45:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 17:45:03 2016 +0000
tree 64b596fd90d9204d3791b0e195f1cb8d91ac2fcf
parent 5aaac0152f53b93df437f07b14bdbe8b303e22c0
parent 8c41a1c9bc9c61b7b63ce7ab1a6b2f0a099dbf01

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

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 39c21f1..908d2f0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -2053,7 +2053,8 @@
         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);