PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Antol
2024-05-17 16:19:32 +00:00
committed by Android (Google) Code Review
parent 19b01bd68b f5cc663a8a
commit c4c5ad5642
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/sound/AudioSwitchPreferenceController.java
View File

@@ -242,6 +242,10 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
return connectedDevices; return connectedDevices;
} }
final List<BluetoothDevice> devices = leAudioProfile.getConnectedDevices(); final List<BluetoothDevice> devices = leAudioProfile.getConnectedDevices();
if (devices == null) {
Log.d(TAG, "No connected LeAudioProfile devices");
return connectedDevices;
}
for (BluetoothDevice device : devices) { for (BluetoothDevice device : devices) {
if (device.isConnected() && isDeviceInCachedList(device)) { if (device.isConnected() && isDeviceInCachedList(device)) {
connectedDevices.add(device); connectedDevices.add(device);

9
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
View File

@@ -516,6 +516,15 @@ public class AudioOutputSwitchPreferenceControllerTest {
assertThat(mEmptyDevices).containsExactly(connectedBtLeAduioDevice1); 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 @Test
public void findActiveLeAudioDevice_noActiveDevice_returnNull() { public void findActiveLeAudioDevice_noActiveDevice_returnNull() {
mLeAudioActiveDevices.clear(); mLeAudioActiveDevices.clear();