Rename SampleMediaRoute2ProviderService to StubMediaRoute2ProviderService am:... (ad90a932) · Commits · e / os / android_frameworks_base

media/tests/MediaRouter/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		<application android:label="@string/app_name">
		<uses-library android:name="android.test.runner" />
		<service android:name=".SampleMediaRoute2ProviderService"
		<service android:name=".StubMediaRoute2ProviderService"
		android:exported="true">
		<intent-filter>
		<action android:name="android.media.MediaRoute2ProviderService" />

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+15 −15

Original line number	Diff line number	Diff line
		@@ -22,16 +22,16 @@ import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE;
		import static android.media.MediaRoute2ProviderService.REASON_REJECTED;
		import static android.media.MediaRoute2ProviderService.REQUEST_ID_NONE;

		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SAMPLE;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SPECIAL;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID1;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID2;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID5_TO_TRANSFER_TO;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_FIXED_VOLUME;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_SPECIAL_FEATURE;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_VARIABLE_VOLUME;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_NAME2;
		import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.VOLUME_MAX;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.FEATURE_SAMPLE;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.FEATURE_SPECIAL;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID1;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID2;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID5_TO_TRANSFER_TO;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_FIXED_VOLUME;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_SPECIAL_FEATURE;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_VARIABLE_VOLUME;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_NAME2;
		import static com.android.mediaroutertest.StubMediaRoute2ProviderService.VOLUME_MAX;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		@@ -115,7 +115,7 @@ public class MediaRouter2ManagerTest {
		// unregister callbacks
		clearCallbacks();

		SampleMediaRoute2ProviderService instance = SampleMediaRoute2ProviderService.getInstance();
		StubMediaRoute2ProviderService instance = StubMediaRoute2ProviderService.getInstance();
		if (instance != null) {
		instance.setProxy(null);
		}
		@@ -161,8 +161,8 @@ public class MediaRouter2ManagerTest {

		MediaRoute2Info routeToRemove = routes.get(ROUTE_ID2);

		SampleMediaRoute2ProviderService sInstance =
		SampleMediaRoute2ProviderService.getInstance();
		StubMediaRoute2ProviderService sInstance =
		StubMediaRoute2ProviderService.getInstance();
		assertNotNull(sInstance);
		sInstance.removeRoute(ROUTE_ID2);
		assertTrue(removedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
		@@ -413,12 +413,12 @@ public class MediaRouter2ManagerTest {
		Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
		MediaRoute2Info volRoute = routes.get(ROUTE_ID_VARIABLE_VOLUME);

		SampleMediaRoute2ProviderService instance = SampleMediaRoute2ProviderService.getInstance();
		StubMediaRoute2ProviderService instance = StubMediaRoute2ProviderService.getInstance();
		assertNotNull(instance);

		final List<Long> requestIds = new ArrayList<>();
		final CountDownLatch onSetRouteVolumeLatch = new CountDownLatch(1);
		instance.setProxy(new SampleMediaRoute2ProviderService.Proxy() {
		instance.setProxy(new StubMediaRoute2ProviderService.Proxy() {
		@Override
		public void onSetRouteVolume(String routeId, int volume, long requestId) {
		requestIds.add(requestId);

media/tests/MediaRouter/src/com/android/mediaroutertest/SampleMediaRoute2ProviderService.java→media/tests/MediaRouter/src/com/android/mediaroutertest/StubMediaRoute2ProviderService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import java.util.Objects;

		import javax.annotation.concurrent.GuardedBy;

		public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService {
		public class StubMediaRoute2ProviderService extends MediaRoute2ProviderService {
		private static final String TAG = "SampleMR2ProviderSvc";
		private static final Object sLock = new Object();

		@@ -74,7 +74,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
		private int mNextSessionId = 1000;

		@GuardedBy("sLock")
		private static SampleMediaRoute2ProviderService sInstance;
		private static StubMediaRoute2ProviderService sInstance;
		private Proxy mProxy;

		private void initializeRoutes() {
		@@ -127,7 +127,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
		mRoutes.put(variableVolumeRoute.getId(), variableVolumeRoute);
		}

		public static SampleMediaRoute2ProviderService getInstance() {
		public static StubMediaRoute2ProviderService getInstance() {
		synchronized (sLock) {
		return sInstance;
		}