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

Commit 422412d2 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Remove redundant method in LocalMediaManager 

Test: atest LocalMediaManagerTest
Bug: 241888071
Bug: 235352899
Change-Id: I8789c70a007bddf0233f7a09540801cb2677c1fa
parent 2276aab2

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

+3 −26
Original line number Diff line number Diff line
@@ -161,10 +161,7 @@ public class LocalMediaManager implements BluetoothCallback { 
     * @return {@code true} if successfully call, otherwise return {@code false}

     */

    public boolean connectDevice(MediaDevice connectDevice) {

        MediaDevice device = null;

        synchronized (mMediaDevicesLock) {

            device = getMediaDeviceById(mMediaDevices, connectDevice.getId());

        }

        MediaDevice device = getMediaDeviceById(connectDevice.getId());

        if (device == null) {

            Log.w(TAG, "connectDevice() connectDevice not in the list!");

            return false;
@@ -277,23 +274,6 @@ public class LocalMediaManager implements BluetoothCallback { 
    /**

     * Find the MediaDevice through id.

     *

     * @param devices the list of MediaDevice

     * @param id the unique id of MediaDevice

     * @return MediaDevice

     */

    public MediaDevice getMediaDeviceById(List<MediaDevice> devices, String id) {

        for (MediaDevice mediaDevice : devices) {

            if (TextUtils.equals(mediaDevice.getId(), id)) {

                return mediaDevice;

            }

        }

        Log.i(TAG, "getMediaDeviceById() can't found device");

        return null;

    }



    /**

     * Find the MediaDevice from all media devices by id.

     *

     * @param id the unique id of MediaDevice

     * @return MediaDevice

     */
@@ -305,7 +285,7 @@ public class LocalMediaManager implements BluetoothCallback { 
                }

            }

        }

        Log.i(TAG, "Unable to find device " + id);

        Log.i(TAG, "getMediaDeviceById() failed to find device with id: " + id);

        return null;

    }
@@ -672,10 +652,7 @@ public class LocalMediaManager implements BluetoothCallback { 


        @Override

        public void onConnectedDeviceChanged(String id) {

            MediaDevice connectDevice = null;

            synchronized (mMediaDevicesLock) {

                connectDevice = getMediaDeviceById(mMediaDevices, id);

            }

            MediaDevice connectDevice = getMediaDeviceById(id);

            connectDevice = connectDevice != null

                    ? connectDevice : updateCurrentConnectedDevice();

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

+3 −10
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ public class LocalMediaManagerTest { 
        when(device1.getId()).thenReturn(TEST_DEVICE_ID_1);

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



        final MediaDevice device = mLocalMediaManager

                .getMediaDeviceById(mLocalMediaManager.mMediaDevices, TEST_DEVICE_ID_2);

        MediaDevice device = mLocalMediaManager.getMediaDeviceById(TEST_DEVICE_ID_2);



        assertThat(device.getId()).isEqualTo(TEST_DEVICE_ID_2);

    }
@@ -222,8 +221,7 @@ public class LocalMediaManagerTest { 
        when(device1.getId()).thenReturn(TEST_DEVICE_ID_1);

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



        final MediaDevice device = mLocalMediaManager

                .getMediaDeviceById(mLocalMediaManager.mMediaDevices, TEST_CURRENT_DEVICE_ID);

        MediaDevice device = mLocalMediaManager.getMediaDeviceById(TEST_CURRENT_DEVICE_ID);



        assertThat(device).isNull();

    }
@@ -238,12 +236,7 @@ public class LocalMediaManagerTest { 
        when(device1.getId()).thenReturn(null);

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



        MediaDevice device = mLocalMediaManager

                .getMediaDeviceById(mLocalMediaManager.mMediaDevices, TEST_CURRENT_DEVICE_ID);



        assertThat(device).isNull();



        device = mLocalMediaManager.getMediaDeviceById(TEST_CURRENT_DEVICE_ID);

        MediaDevice device = mLocalMediaManager.getMediaDeviceById(TEST_CURRENT_DEVICE_ID);



        assertThat(device).isNull();

    }