Merge "MediaRouter2: Fix test bug"

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;

        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);

            }

            @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();

                }

            }