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

2024-05-17 16:19:32 +00:00
parent 19b01bd68b f5cc663a8a
commit c4c5ad5642
2 changed files with 13 additions and 0 deletions
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -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);