PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate routing logic from Settings app

Browse Source 
Also, remove unused MediaRouter2Manager references.

This is a non-functional change.

Bug: 192657812
Test: Presubmit
Change-Id: I72f5f40e157cea922ad40a2602fba881572fb708
This commit is contained in:
Iván Budnik
2023-07-10 15:07:56 +00:00
parent 5c44a4b751
commit f9fc86593c
6 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java
View File

@@ -218,16 +218,13 @@ public class MediaDeviceUpdateWorkerTest {
mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
final List<RoutingSessionInfo> routingSessionInfos = new ArrayList<>();
final RoutingSessionInfo remoteSessionInfo = mock(RoutingSessionInfo.class);
final RoutingSessionInfo localSessionInfo = mock(RoutingSessionInfo.class);
when(remoteSessionInfo.isSystemSession()).thenReturn(false);
when(localSessionInfo.isSystemSession()).thenReturn(true);
routingSessionInfos.add(remoteSessionInfo);
routingSessionInfos.add(localSessionInfo);
when(mMediaDeviceUpdateWorker.mLocalMediaManager.getActiveMediaSession()).thenReturn(
routingSessionInfos);
when(mMediaDeviceUpdateWorker.mLocalMediaManager.getRemoteRoutingSessions())
.thenReturn(routingSessionInfos);
assertThat(mMediaDeviceUpdateWorker.getActiveRemoteMediaDevice()).containsExactly(
remoteSessionInfo);
assertThat(mMediaDeviceUpdateWorker.getActiveRemoteMediaDevices())
.containsExactly(remoteSessionInfo);
}
@Test
@@ -246,6 +243,7 @@ public class MediaDeviceUpdateWorkerTest {
TEST_DEVICE_PACKAGE_NAME1);
mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI2);
mMediaDeviceUpdateWorker.mManager = mock(MediaRouter2Manager.class);
mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
when(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName())
.thenReturn(TEST_DEVICE_PACKAGE_NAME2);

4
tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
View File

@@ -100,8 +100,8 @@ public class RemoteMediaSliceTest {
when(remoteSessionInfo.getVolume()).thenReturn(10);
when(remoteSessionInfo.isSystemSession()).thenReturn(false);
mRoutingSessionInfos.add(remoteSessionInfo);
when(sMediaDeviceUpdateWorker.getActiveRemoteMediaDevice()).thenReturn(
mRoutingSessionInfos);
when(sMediaDeviceUpdateWorker.getActiveRemoteMediaDevices())
.thenReturn(mRoutingSessionInfos);
}
@Test

2
tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
View File

@@ -118,7 +118,7 @@ public class RemoteVolumeGroupControllerTest {
when(remoteSessionInfo.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);
when(remoteSessionInfo.isSystemSession()).thenReturn(false);
mRoutingSessionInfos.add(remoteSessionInfo);
when(mLocalMediaManager.getActiveMediaSession()).thenReturn(mRoutingSessionInfos);
when(mLocalMediaManager.getRemoteRoutingSessions()).thenReturn(mRoutingSessionInfos);
}
@Test