From bd4b726f3db372cb6a5a29c35f695b3aca43e119 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 9 Mar 2022 00:57:31 +0000
Subject: [PATCH] System Router: Don't filter by individual prefs

Individual discovery preferences are not supposed to be
applied for system router instances. There was a bug in
ag/17071600 that caused them to be applied incorrectly.

Test: atest SystemMediaRouter2Test
Bug: 223378315
Change-Id: I778530ed0e7611c8c9433aa20cf0e0bbc4d2cc61
---
 media/java/android/media/MediaRouter2.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index 47e402f73f401..d8995b419f505 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -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;