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

2020-07-15 22:34:50 +00:00
parent 6a630f3994 8a40728f6d
commit 37f00df53d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -1407,7 +1407,7 @@ public final class Settings {
                if (pa.mPref.getParseError() == null) {
                    final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId);
                    ArrayList<PreferredActivity> pal = resolver.findFilters(pa);
-                    if (pal == null || pal.size() == 0) {
+                    if (pal == null || pal.size() == 0 || pa.mPref.mAlways) {
                        resolver.addFilter(pa);
                    }
                } else {