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

Commit 4e6e5244 authored by hughchen's avatar hughchen
Browse files

Fix null point exception on LocalMediaManager 

- Use TextUtils.equal() to check string compare.
- Add test case.

Bug: 153144708
Test: make -j42 RunSettingsLibRoboTests
Change-Id: Iabaf4bc86bcf353e1dd86269c7add7690bae0bfe
parent bb5e6b49

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

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class LocalMediaManager implements BluetoothCallback { 
     */

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

        for (MediaDevice mediaDevice : devices) {

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

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

                return mediaDevice;

            }

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

    public MediaDevice getMediaDeviceById(String id) {

        for (MediaDevice mediaDevice : mMediaDevices) {

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

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

                return mediaDevice;

            }

        }

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

+20 −0
Original line number Diff line number Diff line
@@ -217,6 +217,26 @@ public class LocalMediaManagerTest { 
        assertThat(device).isNull();

    }



    @Test

    public void getMediaDeviceById_idIsNull_shouldReturnNull() {

        final MediaDevice device1 = mock(MediaDevice.class);

        final MediaDevice device2 = mock(MediaDevice.class);

        mLocalMediaManager.mMediaDevices.add(device1);

        mLocalMediaManager.mMediaDevices.add(device2);



        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);



        assertThat(device).isNull();

    }



    @Test

    public void onDeviceAdded_addDevice() {

        final MediaDevice device = mock(MediaDevice.class);