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

Commit 677c53ab authored by Oliver Woodman's avatar Oliver Woodman Committed by Automerger Merge Worker
Browse files

Merge "System Router: Don't filter by individual prefs" into tm-dev am: cd135cf0 

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

Change-Id: I275f5eeb66083e44410a30c4e7cb6e445392de34
parents 1196462b cd135cf0

media/java/android/media/MediaRouter2.java

+5 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,11 @@ public final class MediaRouter2 { 
    private List<MediaRoute2Info> filterRoutesWithIndividualPreference(

            List<MediaRoute2Info> routes, RouteDiscoveryPreference discoveryPreference) {

        List<MediaRoute2Info> filteredRoutes = new ArrayList<>();

        if (isSystemRouter()) {

            // Individual discovery preferences do not apply for the system router.

            filteredRoutes.addAll(routes);

            return filteredRoutes;

        }

        for (MediaRoute2Info route : routes) {

            if (!route.hasAnyFeatures(discoveryPreference.getPreferredFeatures())) {

                continue;