Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8b0d0ed authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Make sure Settings app restrictions show up 

Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
parent 3c3fa0cc

src/com/android/settings/users/AppRestrictionsFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
            for (SelectableAppInfo app : visibleApps) {

                String packageName = app.packageName;

                if (packageName == null) continue;

                final boolean isSettingsApp = packageName.equals(getActivity().getPackageName());

                AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);

                final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);

                p.setIcon(app.icon);
@@ -350,8 +351,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
                            app.masterEntry.activityName));

                }

                p.setKey(PKG_PREFIX + packageName);

                p.setSettingsEnabled(hasSettings

                        || packageName.equals(getActivity().getPackageName()));

                p.setSettingsEnabled(hasSettings || isSettingsApp);

                p.setPersistent(false);

                p.setOnPreferenceChangeListener(this);

                p.setOnPreferenceClickListener(this);
@@ -368,7 +368,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
                    p.setChecked(true);

                    p.setImmutable(true);

                    // If the app is required and has no restrictions, skip showing it

                    if (!hasSettings) continue;

                    if (!hasSettings && !isSettingsApp) continue;

                } else if (!mNewUser && appInfoListHasPackage(userApps, packageName)) {

                    p.setChecked(true);

                }
@@ -377,7 +377,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
                    p.setChecked(mSelectedPackages.get(packageName));

                }

                mAppList.addPreference(p);

                if (packageName.equals(getActivity().getPackageName())) {

                if (isSettingsApp) {

                    p.setOrder(MAX_APP_RESTRICTIONS * 1);

                } else {

                    p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));