diff options
author | Kyunglyul Hyun <klhyun@google.com> | 2020-01-29 19:59:33 +0900 |
---|---|---|
committer | Kyunglyul Hyun <klhyun@google.com> | 2020-01-31 17:11:27 +0900 |
commit | 96d36cee930f67a644f6f98408541082224e413a (patch) | |
tree | d9d9a1fdc985e06d4a94373a82996cf8f73b5c5e /media/tests | |
parent | 1605af297d4ab67439b2e751c55b33f7ad5515c1 (diff) |
MediaRouter: Add MediaRoute2Info#isSystemRoute
MediaRoute2Info#isSystemRoute returns true only if
it is generated by SystemMediaRoute2Provider.
In addition, MediaRouter2 and MediaRouter2Manager
always include system routes when getRoutes or getAvailableRoutes
is called.
This CL will change the behavior of MediaRouter2#getRoutes(), however,
without this change, there doesn't seem to be a good way to get
system routes. (e.g. how can we support multiple bt routes in xMR?)
Bug: 145632124
Test: atest android.media.cts.MediaRoute2InfoTest
&& atest android.media.cts.MediaRouter2Test
&& atest android.media.cts.RouteDiscoveryPreferenceTest
&& atest android.media.cts.RoutingSessionInfoTest
&& atest mediaroutertest
Change-Id: I18ea188b68e6e1335cb0e25c3cc3674910d4d645
Diffstat (limited to 'media/tests')
-rw-r--r-- | media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java index 4a2044af0431..16259ab45792 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java @@ -196,7 +196,14 @@ public class MediaRouterManagerTest { public void testRouteFeatures() throws Exception { Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_SPECIAL); - assertEquals(1, routes.size()); + int routeCount = 0; + for (MediaRoute2Info route : routes.values()) { + if (!route.isSystemRoute()) { + routeCount++; + } + } + + assertEquals(1, routeCount); assertNotNull(routes.get(ROUTE_ID_SPECIAL_FEATURE)); } |