commit 0577f178a7534b9d2d9aa844afbb0cae906ca145
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 21 17:43:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 21 17:43:05 2024 +0000
tree 3202c671cf282b62010cbfc542bec0a069c6626c
parent 3c92fffb97fd215569f69785689c35182e5f7052
parent 1663066c5258b397260e47a36ad8a84ca30d12df

Merge "CSD: Fix condition when dropping HAL BT CSD vals" into main

services/audioflinger/sounddose/SoundDoseManager.cpp

diff --git a/services/audioflinger/sounddose/SoundDoseManager.cpp b/services/audioflinger/sounddose/SoundDoseManager.cpp
index 8d40b63..3b764d1 100644
--- a/services/audioflinger/sounddose/SoundDoseManager.cpp
+++ b/services/audioflinger/sounddose/SoundDoseManager.cpp
@@ -231,10 +231,12 @@
         ALOGI("%s: could not find port id for device %s", __func__, adt.toString().c_str());
         return AUDIO_PORT_HANDLE_NONE;
     }
-    const auto btDeviceIt = mBluetoothDevicesWithCsd.find(std::make_pair(address, type));
-    if (btDeviceIt != mBluetoothDevicesWithCsd.end()) {
-        if (!btDeviceIt->second) {
-            ALOGI("%s: bt device %s does not support sound dose", __func__, adt.toString().c_str());
+
+    if (audio_is_ble_out_device(type) || audio_is_a2dp_device(type)) {
+        const auto btDeviceIt = mBluetoothDevicesWithCsd.find(std::make_pair(address, type));
+        if (btDeviceIt == mBluetoothDevicesWithCsd.end() || !btDeviceIt->second) {
+            ALOGI("%s: bt device %s does not support sound dose", __func__,
+                  adt.toString().c_str());
             return AUDIO_PORT_HANDLE_NONE;
         }
     }