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

Commit 1dcf7dfc authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

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

parents 729b60c0 726f3030

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

                }

            }

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -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);