diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 999bbc9ecf4e9..67412a8da7f5b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -19863,7 +19863,7 @@ public class PackageManagerService extends IPackageManager.Stub final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId); final ArrayList 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); } } } diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 74bc49dd91080..f801702f7ddd0 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -3183,7 +3183,7 @@ public final class Settings { } } - void removeFiltersLPw(@NonNull PreferredIntentResolver pir, + static void removeFilters(@NonNull PreferredIntentResolver pir, @NonNull IntentFilter filter, @NonNull List 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 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);