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

Commit eedd138c authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Remove dead code in MediaManager 

And corresponding tests

Test: atest SettingsLibRoboTests
Bug: 205124386
Change-Id: I55f3f40c12f3df3f9e26391ec7d7015316b29b42
parent 5c7390af

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

+0 −34
Original line number Diff line number Diff line
@@ -492,21 +492,6 @@ public class LocalMediaManager implements BluetoothCallback { 
    }



    class MediaDeviceCallback implements MediaManager.MediaDeviceCallback {

        @Override

        public void onDeviceAdded(MediaDevice device) {

            boolean isAdded = false;

            synchronized (mMediaDevicesLock) {

                if (!mMediaDevices.contains(device)) {

                    mMediaDevices.add(device);

                    isAdded = true;

                }

            }



            if (isAdded) {

                dispatchDeviceListUpdate();

            }

        }



        @Override

        public void onDeviceListAdded(List<MediaDevice> devices) {

            synchronized (mMediaDevicesLock) {
@@ -628,20 +613,6 @@ public class LocalMediaManager implements BluetoothCallback { 
            return false;

        }



        @Override

        public void onDeviceRemoved(MediaDevice device) {

            boolean isRemoved = false;

            synchronized (mMediaDevicesLock) {

                if (mMediaDevices.contains(device)) {

                    mMediaDevices.remove(device);

                    isRemoved = true;

                }

            }

            if (isRemoved) {

                dispatchDeviceListUpdate();

            }

        }



        @Override

        public void onDeviceListRemoved(List<MediaDevice> devices) {

            synchronized (mMediaDevicesLock) {
@@ -665,11 +636,6 @@ public class LocalMediaManager implements BluetoothCallback { 
            }

        }



        @Override

        public void onDeviceAttributesChanged() {

            dispatchDeviceAttributesChanged();

        }



        @Override

        public void onRequestFailed(int reason) {

            synchronized (mMediaDevicesLock) {

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

+0 −37
Original line number Diff line number Diff line
@@ -74,18 +74,6 @@ public abstract class MediaManager { 
        return null;

    }



    protected void dispatchDeviceAdded(MediaDevice mediaDevice) {

        for (MediaDeviceCallback callback : getCallbacks()) {

            callback.onDeviceAdded(mediaDevice);

        }

    }



    protected void dispatchDeviceRemoved(MediaDevice mediaDevice) {

        for (MediaDeviceCallback callback : getCallbacks()) {

            callback.onDeviceRemoved(mediaDevice);

        }

    }



    protected void dispatchDeviceListAdded() {

        for (MediaDeviceCallback callback : getCallbacks()) {

            callback.onDeviceListAdded(new ArrayList<>(mMediaDevices));
@@ -104,12 +92,6 @@ public abstract class MediaManager { 
        }

    }



    protected void dispatchDataChanged() {

        for (MediaDeviceCallback callback : getCallbacks()) {

            callback.onDeviceAttributesChanged();

        }

    }



    protected void dispatchOnRequestFailed(int reason) {

        for (MediaDeviceCallback callback : getCallbacks()) {

            callback.onRequestFailed(reason);
@@ -124,12 +106,6 @@ public abstract class MediaManager { 
     * Callback for notifying device is added, removed and attributes changed.

     */

    public interface MediaDeviceCallback {

        /**

         * Callback for notifying MediaDevice is added.

         *

         * @param device the MediaDevice

         */

        void onDeviceAdded(MediaDevice device);



        /**

         * Callback for notifying MediaDevice list is added.
@@ -138,13 +114,6 @@ public abstract class MediaManager { 
         */

        void onDeviceListAdded(List<MediaDevice> devices);



        /**

         * Callback for notifying MediaDevice is removed.

         *

         * @param device the MediaDevice

         */

        void onDeviceRemoved(MediaDevice device);



        /**

         * Callback for notifying MediaDevice list is removed.

         *
@@ -159,12 +128,6 @@ public abstract class MediaManager { 
         */

        void onConnectedDeviceChanged(String id);



        /**

         * Callback for notifying that MediaDevice attributes

         * (e.g: device name, connection state, subtitle) is changed.

         */

        void onDeviceAttributesChanged();



        /**

         * Callback for notifying that transferring is failed.

         *

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

+0 −100
Original line number Diff line number Diff line
@@ -241,49 +241,6 @@ public class LocalMediaManagerTest { 
        assertThat(device).isNull();

    }



    @Test

    public void onDeviceAdded_addDevice() {

        final MediaDevice device = mock(MediaDevice.class);



        assertThat(mLocalMediaManager.mMediaDevices).isEmpty();

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceAdded(device);



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

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

    }



    @Test

    public void onDeviceAdded_mediaDeviceNotExistAndPhoneDeviceExistInList_addMediaDevice() {

        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



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

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceAdded(device2);



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

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

    }



    @Test

    public void onDeviceAdded_mediaDeviceAndPhoneDeviceExistInList_doNothing() {

        final MediaDevice device1 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



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

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceAdded(device1);



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

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

    }



    @Test

    public void onDeviceListAdded_addDevicesList() {

        final List<MediaDevice> devices = new ArrayList<>();
@@ -328,54 +285,6 @@ public class LocalMediaManagerTest { 
        verify(mCallback).onDeviceListUpdate(any());

    }



    @Test

    public void onDeviceRemoved_removeDevice() {

        final MediaDevice device1 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



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

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceRemoved(device1);



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

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

    }



    @Test

    public void onDeviceRemoved_phoneDeviceNotLastDeviceAfterRemoveMediaDevice_removeMediaDevice() {

        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(device2);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



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

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceRemoved(device2);



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

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

    }



    @Test

    public void onDeviceRemoved_removeMediaDeviceNotInList_doNothing() {

        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device2);

        mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);



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

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onDeviceRemoved(device1);



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

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

    }



    @Test

    public void onDeviceListRemoved_removeAll() {

        final List<MediaDevice> devices = new ArrayList<>();
@@ -478,15 +387,6 @@ public class LocalMediaManagerTest { 
        mLocalMediaManager.mMediaDeviceCallback.onConnectedDeviceChanged(TEST_DEVICE_ID_2);

    }



    @Test

    public void onDeviceAttributesChanged_shouldDispatchDeviceListUpdate() {

        mLocalMediaManager.registerCallback(mCallback);



        mLocalMediaManager.mMediaDeviceCallback.onDeviceAttributesChanged();



        verify(mCallback).onDeviceAttributesChanged();

    }



    @Test

    public void onDeviceAttributesChanged_failingTransferring_shouldResetState() {

        final MediaDevice currentDevice = mock(MediaDevice.class);

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

+0 −27
Original line number Diff line number Diff line
@@ -65,24 +65,6 @@ public class MediaManagerTest { 
        };

    }



    @Test

    public void dispatchDeviceAdded_registerCallback_shouldDispatchCallback() {

        mMediaManager.registerCallback(mCallback);



        mMediaManager.dispatchDeviceAdded(mDevice);



        verify(mCallback).onDeviceAdded(mDevice);

    }



    @Test

    public void dispatchDeviceRemoved_registerCallback_shouldDispatchCallback() {

        mMediaManager.registerCallback(mCallback);



        mMediaManager.dispatchDeviceRemoved(mDevice);



        verify(mCallback).onDeviceRemoved(mDevice);

    }



    @Test

    public void dispatchDeviceListAdded_registerCallback_shouldDispatchCallback() {

        mMediaManager.registerCallback(mCallback);
@@ -110,15 +92,6 @@ public class MediaManagerTest { 
        verify(mCallback).onConnectedDeviceChanged(TEST_ID);

    }



    @Test

    public void dispatchDataChanged_registerCallback_shouldDispatchCallback() {

        mMediaManager.registerCallback(mCallback);



        mMediaManager.dispatchDataChanged();



        verify(mCallback).onDeviceAttributesChanged();

    }



    @Test

    public void findMediaDevice_idExist_shouldReturnMediaDevice() {

        mMediaManager.mMediaDevices.add(mDevice);