Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4268bc7a201e2eae6674f57ce772313cad8ef0a4
This commit is contained in:
Songchun Fan
2020-07-15 22:50:42 +00:00
committed by Automerger Merge Worker
parent 0d050d0f5d 37f00df53d
commit 33c669f4f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/Settings.java
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 {