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

Commit c4c5ad56 authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in AudioSwitchPreferenceController" into 24D1-dev

parents 19b01bd6 f5cc663a

src/com/android/settings/sound/AudioSwitchPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont 
            return connectedDevices;

        }

        final List<BluetoothDevice> devices = leAudioProfile.getConnectedDevices();

        if (devices == null) {

          Log.d(TAG, "No connected LeAudioProfile devices");

          return connectedDevices;

        }

        for (BluetoothDevice device : devices) {

            if (device.isConnected() && isDeviceInCachedList(device)) {

                connectedDevices.add(device);

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

+9 −0
Original line number Diff line number Diff line
@@ -516,6 +516,15 @@ public class AudioOutputSwitchPreferenceControllerTest { 
        assertThat(mEmptyDevices).containsExactly(connectedBtLeAduioDevice1);

    }



    @Test

    public void getConnectedLeAudioDevices_nullConnectedDevices_returnEmptyList() {

      when(mLeAudioProfile.getConnectedDevices()).thenReturn(null);



      List<BluetoothDevice> connectedDevices = mController.getConnectedLeAudioDevices();



      assertThat(connectedDevices.isEmpty()).isTrue();

    }



    @Test

    public void findActiveLeAudioDevice_noActiveDevice_returnNull() {

        mLeAudioActiveDevices.clear();