Merge "Adding encryption aware matcher flags to install shortcut disabling" into nyc-mr1-dev
diff --git a/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java b/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
index f3c1c7e..04446a1 100644
--- a/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
+++ b/src/com/android/managedprovisioning/task/DisableInstallShortcutListenersTask.java
@@ -60,7 +60,9 @@
* Disable all components that can handle the specified broadcast intent.
*/
private void disableReceivers(Intent intent) {
- List<ResolveInfo> receivers = mPm.queryBroadcastReceiversAsUser(intent, 0, mUserId);
+ List<ResolveInfo> receivers = mPm.queryBroadcastReceiversAsUser(intent,
+ PackageManager.MATCH_DIRECT_BOOT_UNAWARE | PackageManager.MATCH_DIRECT_BOOT_AWARE,
+ mUserId);
for (ResolveInfo ri : receivers) {
// One of ri.activityInfo, ri.serviceInfo, ri.providerInfo is not null. Let's find which
// one.