am c3e973c5: am 0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev

* commit 'c3e973c5da358489f6b7042d5be982e4e7ea6d00':
  Revert "Disabled apps should also be shown in restricted profiles app list"
This commit is contained in:
Amith Yamasani
2013-04-25 17:14:40 -07:00
committed by Android Git Automerger

View File

@@ -350,8 +350,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private void addSystemApps(List<SelectableAppInfo> visibleApps, Intent intent) { private void addSystemApps(List<SelectableAppInfo> visibleApps, Intent intent) {
if (getActivity() == null) return; if (getActivity() == null) return;
final PackageManager pm = getActivity().getPackageManager(); final PackageManager pm = getActivity().getPackageManager();
List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent, List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent, 0);
PackageManager.GET_DISABLED_COMPONENTS);
for (ResolveInfo app : launchableApps) { for (ResolveInfo app : launchableApps) {
if (app.activityInfo != null && app.activityInfo.applicationInfo != null) { if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
int flags = app.activityInfo.applicationInfo.flags; int flags = app.activityInfo.applicationInfo.flags;