Merge "pm: query both direct boot un/aware activities" (c16bf253) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/AppsQueryHelper.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -168,8 +168,9 @@ public class AppsQueryHelper {
		@SuppressWarnings("unchecked")
		protected List<ApplicationInfo> 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<ResolveInfo> 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();
		}