From bb803cf2f602d2b1302d0ce33a8066ac30aa471b Mon Sep 17 00:00:00 2001 From: Xiaohui Chen Date: Mon, 16 May 2016 16:46:11 -0700 Subject: [PATCH] pm: query both direct boot un/aware activities Bug: 28762791 Change-Id: I64009c75ae7ac8784e739349b70d0413f0b4681a --- .../java/android/content/pm/AppsQueryHelper.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/core/java/android/content/pm/AppsQueryHelper.java b/core/java/android/content/pm/AppsQueryHelper.java index 4c01b2783f8d6..6cb7f774776e6 100644 --- a/core/java/android/content/pm/AppsQueryHelper.java +++ b/core/java/android/content/pm/AppsQueryHelper.java @@ -168,8 +168,9 @@ public class AppsQueryHelper { @SuppressWarnings("unchecked") protected List getAllApps(int userId) { try { - return mPackageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES - | PackageManager.GET_DISABLED_COMPONENTS, userId).getList(); + return mPackageManager.getInstalledApplications( + PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_DISABLED_COMPONENTS, userId).getList(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -179,8 +180,10 @@ public class AppsQueryHelper { protected List queryIntentActivitiesAsUser(Intent intent, int userId) { try { return mPackageManager.queryIntentActivities(intent, null, - PackageManager.GET_DISABLED_COMPONENTS - | PackageManager.GET_UNINSTALLED_PACKAGES, + PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userId).getList(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -192,7 +195,10 @@ public class AppsQueryHelper { try { return mPackageManager.queryIntentServices(intent, null, PackageManager.GET_META_DATA - | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, userId).getList(); + | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS + | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userId) + .getList(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); }