Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 244910e4 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Remove LocalMediaManager.mPhoneDevice"

parents e4c0e14a 0a8f3ee4

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ public class LocalMediaManager implements BluetoothCallback { 
    @VisibleForTesting

    List<MediaDevice> mDisconnectedMediaDevices = new CopyOnWriteArrayList<>();

    @VisibleForTesting

    MediaDevice mPhoneDevice;

    @VisibleForTesting

    MediaDevice mCurrentConnectedDevice;

    @VisibleForTesting

    DeviceAttributeChangeCallback mDeviceAttributeChangeCallback =

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java

+6 −20
Original line number Diff line number Diff line
@@ -266,18 +266,15 @@ public class LocalMediaManagerTest { 
        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        final MediaDevice device3 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        devices.add(device1);

        devices.add(device2);

        mLocalMediaManager.mMediaDevices.add(device3);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



        when(device1.getId()).thenReturn(TEST_DEVICE_ID_1);

        when(device2.getId()).thenReturn(TEST_DEVICE_ID_2);

        when(device3.getId()).thenReturn(TEST_DEVICE_ID_3);

        when(mLocalMediaManager.mPhoneDevice.getId()).thenReturn("test_phone_id");



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(1);

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceListAdded(devices);
@@ -290,14 +287,12 @@ public class LocalMediaManagerTest { 
        final List<MediaDevice> devices = new ArrayList<>();

        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        devices.add(device1);

        devices.add(device2);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(device2);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(3);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback

                .onDeviceListRemoved(mLocalMediaManager.mMediaDevices);
@@ -312,19 +307,17 @@ public class LocalMediaManagerTest { 
        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        final MediaDevice device3 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        devices.add(device1);

        devices.add(device3);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(device2);

        mLocalMediaManager.mMediaDevices.add(device3);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(4);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(3);

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceListRemoved(devices);



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(1);

        verify(mCallback).onDeviceListUpdate(any());

    }
@@ -452,9 +445,7 @@ public class LocalMediaManagerTest { 
    public void onDeviceListAdded_haveMutingExpectedDevice_addMutingExpectedDevice() {

        final List<MediaDevice> devices = new ArrayList<>();

        final MediaDevice device1 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        devices.add(device1);

        devices.add(mLocalMediaManager.mPhoneDevice);



        final List<LocalBluetoothProfile> profiles = new ArrayList<>();

        final A2dpProfile a2dpProfile = mock(A2dpProfile.class);
@@ -483,13 +474,12 @@ public class LocalMediaManagerTest { 


        when(device1.getId()).thenReturn(TEST_DEVICE_ID_1);

        when(device1.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE);

        when(mLocalMediaManager.mPhoneDevice.getId()).thenReturn("test_phone_id");



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(0);

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceListAdded(devices);



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(3);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);

        verify(mCallback).onDeviceListUpdate(any());

    }
@@ -536,17 +526,13 @@ public class LocalMediaManagerTest { 
        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        final MediaDevice device3 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        devices.add(device1);

        devices.add(device2);

        mLocalMediaManager.mMediaDevices.add(device3);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



        mShadowBluetoothAdapter = null;



        when(mLocalMediaManager.mPhoneDevice.getId()).thenReturn("test_phone_id");



        assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);

        assertThat(mLocalMediaManager.mMediaDevices).hasSize(1);

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceListAdded(devices);