summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-04-25 21:39:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-25 21:39:23 +0000
commit39d0fd84ad17d034720c65c6dc19323e1bda17de (patch)
treeadc33155753239e9d699da0fe4dc70d084b55525 /src/com/android/settings/users
parent90dcd7469b7e776f508a0767b9db46005af0e8da (diff)
downloadpackages_apps_Settings-39d0fd84ad17d034720c65c6dc19323e1bda17de.zip
packages_apps_Settings-39d0fd84ad17d034720c65c6dc19323e1bda17de.tar.gz
packages_apps_Settings-39d0fd84ad17d034720c65c6dc19323e1bda17de.tar.bz2
Revert "Disabled apps should also be shown in restricted profiles app list"
This is breaking restricted profiles because the Google Keyboard suddenly shows up in the list as disabled and InputMethodManagerService crashes if the only available keyboard is not installed for the profile. This reverts commit 90dcd7469b7e776f508a0767b9db46005af0e8da Change-Id: Idd7c4f0f93a973b777889865e80c53caad759a63
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r--src/com/android/settings/users/AppRestrictionsFragment.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 6084214..9f64b71 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -350,8 +350,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private void addSystemApps(List<SelectableAppInfo> visibleApps, Intent intent) {
if (getActivity() == null) return;
final PackageManager pm = getActivity().getPackageManager();
- List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent,
- PackageManager.GET_DISABLED_COMPONENTS);
+ List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent, 0);
for (ResolveInfo app : launchableApps) {
if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
int flags = app.activityInfo.applicationInfo.flags;