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

Rename SampleMediaRoute2ProviderService to StubMediaRoute2ProviderService

Browse Source 
Bug: 151538499
Test: atest mediaroutertest
Change-Id: I1467acf7482ac5421b800281e367353f08358eab
This commit is contained in:
Hyundo Moon
2020-03-15 19:46:41 +09:00
parent b4decfc142
commit 1c888e2dbb
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/tests/MediaRouter/AndroidManifest.xml
View File

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

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

@@ -22,16 +22,16 @@ import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE;
import static android.media.MediaRoute2ProviderService.REASON_REJECTED; import static android.media.MediaRoute2ProviderService.REASON_REJECTED;
import static android.media.MediaRoute2ProviderService.REQUEST_ID_NONE; import static android.media.MediaRoute2ProviderService.REQUEST_ID_NONE;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SAMPLE; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.FEATURE_SAMPLE;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SPECIAL; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.FEATURE_SPECIAL;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID1; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID1;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID2; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID2;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID5_TO_TRANSFER_TO; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID5_TO_TRANSFER_TO;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_FIXED_VOLUME; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_FIXED_VOLUME;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_SPECIAL_FEATURE; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_SPECIAL_FEATURE;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_VARIABLE_VOLUME; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_ID_VARIABLE_VOLUME;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_NAME2; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.ROUTE_NAME2;
import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.VOLUME_MAX; import static com.android.mediaroutertest.StubMediaRoute2ProviderService.VOLUME_MAX;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@@ -115,7 +115,7 @@ public class MediaRouter2ManagerTest {
// unregister callbacks // unregister callbacks
clearCallbacks(); clearCallbacks();
SampleMediaRoute2ProviderService instance = SampleMediaRoute2ProviderService.getInstance(); StubMediaRoute2ProviderService instance = StubMediaRoute2ProviderService.getInstance();
if (instance != null) { if (instance != null) {
instance.setProxy(null); instance.setProxy(null);
} }
@@ -161,8 +161,8 @@ public class MediaRouter2ManagerTest {
MediaRoute2Info routeToRemove = routes.get(ROUTE_ID2); MediaRoute2Info routeToRemove = routes.get(ROUTE_ID2);
SampleMediaRoute2ProviderService sInstance = StubMediaRoute2ProviderService sInstance =
SampleMediaRoute2ProviderService.getInstance(); StubMediaRoute2ProviderService.getInstance();
assertNotNull(sInstance); assertNotNull(sInstance);
sInstance.removeRoute(ROUTE_ID2); sInstance.removeRoute(ROUTE_ID2);
assertTrue(removedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); assertTrue(removedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
@@ -413,12 +413,12 @@ public class MediaRouter2ManagerTest {
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL); Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
MediaRoute2Info volRoute = routes.get(ROUTE_ID_VARIABLE_VOLUME); MediaRoute2Info volRoute = routes.get(ROUTE_ID_VARIABLE_VOLUME);
SampleMediaRoute2ProviderService instance = SampleMediaRoute2ProviderService.getInstance(); StubMediaRoute2ProviderService instance = StubMediaRoute2ProviderService.getInstance();
assertNotNull(instance); assertNotNull(instance);
final List<Long> requestIds = new ArrayList<>(); final List<Long> requestIds = new ArrayList<>();
final CountDownLatch onSetRouteVolumeLatch = new CountDownLatch(1); final CountDownLatch onSetRouteVolumeLatch = new CountDownLatch(1);
instance.setProxy(new SampleMediaRoute2ProviderService.Proxy() { instance.setProxy(new StubMediaRoute2ProviderService.Proxy() {
@Override @Override
public void onSetRouteVolume(String routeId, int volume, long requestId) { public void onSetRouteVolume(String routeId, int volume, long requestId) {
requestIds.add(requestId); requestIds.add(requestId);

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

@@ -36,7 +36,7 @@ import java.util.Objects;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService { public class StubMediaRoute2ProviderService extends MediaRoute2ProviderService {
private static final String TAG = "SampleMR2ProviderSvc"; private static final String TAG = "SampleMR2ProviderSvc";
private static final Object sLock = new Object(); private static final Object sLock = new Object();
@@ -74,7 +74,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
private int mNextSessionId = 1000; private int mNextSessionId = 1000;
@GuardedBy("sLock") @GuardedBy("sLock")
private static SampleMediaRoute2ProviderService sInstance; private static StubMediaRoute2ProviderService sInstance;
private Proxy mProxy; private Proxy mProxy;
private void initializeRoutes() { private void initializeRoutes() {
@@ -127,7 +127,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
mRoutes.put(variableVolumeRoute.getId(), variableVolumeRoute); mRoutes.put(variableVolumeRoute.getId(), variableVolumeRoute);
} }
public static SampleMediaRoute2ProviderService getInstance() { public static StubMediaRoute2ProviderService getInstance() {
synchronized (sLock) { synchronized (sLock) {
return sInstance; return sInstance;
} }