diff options
| author | Jakub Pawłowski <jpawlowski@google.com> | 2022-03-05 08:29:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-05 08:29:17 +0000 |
| commit | 24c1b944b35c245c42533bd458363e31e8f15e1a (patch) | |
| tree | c8039404310fd29e02531d8ecc0d4bce36ca69a2 | |
| parent | c113d94ae025a32090988b56a48dcfe1b8cd953f (diff) | |
| parent | a50564255909e0d79b544366e66af7cae4e361e6 (diff) | |
Merge "Do not return null as active device" am: 1e33487f33 am: a505642559
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2007022
Change-Id: I6aafd604fe1d313c6705e2b3f01b8f10b62baf6c
| -rw-r--r-- | android/app/src/com/android/bluetooth/btservice/AdapterService.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java index 624e71720a..e68abd7052 100644 --- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java +++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java @@ -860,6 +860,7 @@ public class AdapterService extends Service { errorLog( "Cannot switch buffer size. The number of A2DP active devices is " + activeDevices.size()); + return; } mA2dpService.switchCodecByBufferSize(activeDevices.get(0), isLowLatencyBufferSize); } @@ -4100,16 +4101,22 @@ public class AdapterService extends Service { if (mHeadsetService == null) { Log.e(TAG, "getActiveDevices: HeadsetService is null"); } else { - activeDevices.add(mHeadsetService.getActiveDevice()); - Log.i(TAG, "getActiveDevices: Headset device: " + activeDevices.get(0)); + BluetoothDevice device = mHeadsetService.getActiveDevice(); + if (device != null) { + activeDevices.add(device); + } + Log.i(TAG, "getActiveDevices: Headset device: " + device); } break; case BluetoothProfile.A2DP: if (mA2dpService == null) { Log.e(TAG, "getActiveDevices: A2dpService is null"); } else { - activeDevices.add(mA2dpService.getActiveDevice()); - Log.i(TAG, "getActiveDevices: A2dp device: " + activeDevices.get(0)); + BluetoothDevice device = mA2dpService.getActiveDevice(); + if (device != null) { + activeDevices.add(device); + } + Log.i(TAG, "getActiveDevices: A2dp device: " + device); } break; case BluetoothProfile.HEARING_AID: |