Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev

This commit is contained in:
Songchun Fan
2020-07-15 22:34:50 +00:00
committed by Android (Google) Code Review

View File

@@ -1407,7 +1407,7 @@ public final class Settings {
if (pa.mPref.getParseError() == null) { if (pa.mPref.getParseError() == null) {
final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId); final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId);
ArrayList<PreferredActivity> pal = resolver.findFilters(pa); ArrayList<PreferredActivity> pal = resolver.findFilters(pa);
if (pal == null || pal.size() == 0) { if (pal == null || pal.size() == 0 || pa.mPref.mAlways) {
resolver.addFilter(pa); resolver.addFilter(pa);
} }
} else { } else {