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

Merge "Removes existing one when apply a default preferred app (2/2)"

Browse Source
This commit is contained in:
Rhed Jao
2020-09-14 02:17:58 +00:00
committed by Android (Google) Code Review
parent 729b60c01c 726f3030dd
commit 1dcf7dfc53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -19863,7 +19863,7 @@ public class PackageManagerService extends IPackageManager.Stub
final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);
final ArrayList<PreferredActivity> existing = pir.findFilters(filter);
if (removeExisting && existing != null) {
mSettings.removeFiltersLPw(pir, filter, existing);
Settings.removeFilters(pir, filter, existing);
}
pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
scheduleWritePackageRestrictionsLocked(userId);
@@ -19964,7 +19964,7 @@ public class PackageManagerService extends IPackageManager.Stub
}
}
if (existing != null) {
mSettings.removeFiltersLPw(pir, filter, existing);
Settings.removeFilters(pir, filter, existing);
}
}
}

4
services/core/java/com/android/server/pm/Settings.java
View File

@@ -3183,7 +3183,7 @@ public final class Settings {
}
}
void removeFiltersLPw(@NonNull PreferredIntentResolver pir,
static void removeFilters(@NonNull PreferredIntentResolver pir,
@NonNull IntentFilter filter, @NonNull List<PreferredActivity> existing) {
if (PackageManagerService.DEBUG_PREFERRED) {
Slog.i(TAG, existing.size() + " preferred matches for:");
@@ -3405,7 +3405,7 @@ public final class Settings {
final PreferredIntentResolver pir = editPreferredActivitiesLPw(userId);
final List<PreferredActivity> existing = pir.findFilters(filter);
if (existing != null) {
removeFiltersLPw(pir, filter, existing);
removeFilters(pir, filter, existing);
}
PreferredActivity pa = new PreferredActivity(filter, systemMatch, set, cn, true);
pir.addFilter(pa);