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

Commit 6225c24b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Filter preferred activities before committing to storage"

parents fc164dbd 6a255f79

services/core/java/com/android/server/pm/Settings.java

+5 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,11 @@ public final class Settings { 
            if (tagName.equals(TAG_ITEM)) {

                PreferredActivity pa = new PreferredActivity(parser);

                if (pa.mPref.getParseError() == null) {

                    editPreferredActivitiesLPw(userId).addFilter(pa);

                    final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId);

                    ArrayList<PreferredActivity> pal = resolver.findFilters(pa);

                    if (pal == null || pal.size() == 0) {

                        resolver.addFilter(pa);

                    }

                } else {

                    PackageManagerService.reportSettingsProblem(Log.WARN,

                            "Error in package manager settings: <preferred-activity> "