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

Commit 2408b165 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

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

Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df5 am: f049d218

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160605

Change-Id: I264c46231e6b3f44188e7e394b9bbda5c9cdb854
parents 311f8cde f049d218

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {