Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "pm: query both direct boot un/aware activities"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-17 17:26:50 +00:00
committed by Android (Google) Code Review
parent affda09d89 bb803cf2f6
commit c16bf253a2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/content/pm/AppsQueryHelper.java
View File

@@ -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();
}