From 726f3030ddde7f5f463aaf995732df689c238282 Mon Sep 17 00:00:00 2001
From: Rhed Jao <rhedjao@google.com>
Date: Fri, 11 Sep 2020 19:22:30 +0800
Subject: [PATCH] Removes existing one when apply a default preferred app (2/2)

Fine tune the method of remove filters.

Bug: 141254650
Test: builds
Change-Id: I298bac02a67dd184e8a9b508ac9a24cc1d278073
---
 .../java/com/android/server/pm/PackageManagerService.java     | 4 ++--
 services/core/java/com/android/server/pm/Settings.java        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index fcf5d9691d992..062e5277ea7b1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19862,7 +19862,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);
@@ -19963,7 +19963,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<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);