Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaRouter2: Fix test bug"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-20 23:19:36 +00:00
committed by Android (Google) Code Review
parent 18797a400b f55befbfbe
commit 2e549f0122
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
View File

@@ -55,7 +55,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -296,7 +295,7 @@ public class MediaRouter2ManagerTest {
String selectedSystemRouteId =
MediaRouter2Utils.getOriginalId(
mManager.getActiveSessions().get(0).getSelectedRoutes().get(0));
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(Collections.emptyList());
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
MediaRoute2Info volRoute = routes.get(selectedSystemRouteId);
assertNotNull(volRoute);
@@ -429,10 +428,11 @@ public class MediaRouter2ManagerTest {
}
@Override
public void onControlCategoriesChanged(String packageName,
public void onPreferredFeaturesChanged(String packageName,
List<String> preferredFeatures) {
if (TextUtils.equals(mPackageName, packageName)
&& preferredFeatures.equals(routeFeatures)) {
&& preferredFeatures.size() == routeFeatures.size()
&& preferredFeatures.containsAll(routeFeatures)) {
featuresLatch.countDown();
}
}