summaryrefslogtreecommitdiff
path: root/btif/src
diff options
context:
space:
mode:
authoralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
committeralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
commitb5b7ccf6def93ede838bf60345104b688f1d5632 (patch)
tree4eb12c4c287cf0369a782d94f3732ac6417fc21d /btif/src
parent810097b0cf3fbccb54027c408db59023f0bc13ed (diff)
parent913e85217c103e559d6d2c1a9528ef796744e57b (diff)
Merge tag 'LA.QSSI.13.0.r1-10200-qssi.0' into tachibanaHEADtachibana
"LA.QSSI.13.0.r1-10200-qssi.0" Change-Id: I4db0203d2218efb18f82aa939e00f946f7361b84
Diffstat (limited to 'btif/src')
-rw-r--r--btif/src/btif_ahim.cc5
-rw-r--r--btif/src/btif_dm.cc1
2 files changed, 3 insertions, 3 deletions
diff --git a/btif/src/btif_ahim.cc b/btif/src/btif_ahim.cc
index c9d0de4b2..080348bbc 100644
--- a/btif/src/btif_ahim.cc
+++ b/btif/src/btif_ahim.cc
@@ -517,8 +517,7 @@ LeAudioConfiguration fetch_offload_audio_config(int profile, int direction) {
CodecIndex codec_type = (CodecIndex) pclient_cbs[profile - 1]->get_codec_type(direction);
if (codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_LE ||
codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_R4) {
- frame_duration =
- ((pclient_cbs[profile - 1]->get_min_sup_frame_dur(direction)) / 4) * 1000;
+ frame_duration = pclient_cbs[profile - 1]->get_frame_duration(direction);
LOG(ERROR) << __func__ << ": fetch frame duration: "
<< frame_duration << ", from leaudio_configs.xml";
}
@@ -554,7 +553,7 @@ LeAudioConfiguration fetch_offload_audio_config(int profile, int direction) {
if (codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_LE ||
codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_R4) {
le_vendor_config.codecSpecificData[5] = 0x11; // Aptx Adaptive Type
- le_vendor_config.codecSpecificData[8] = pclient_cbs[profile - 1]->get_min_sup_frame_dur(direction);
+ le_vendor_config.codecSpecificData[8] = frame_duration;
le_vendor_config.codecSpecificData[9] = pclient_cbs[profile - 1]->get_feature_map(direction);
if (codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_R4) {
le_vendor_config.vendorCodecType = VendorCodecType::APTX_ADAPTIVE_R4;
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 785a089e7..8864c4e4d 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -707,6 +707,7 @@ void bond_state_changed(bt_status_t status, const RawAddress& bd_addr,
btif_store_adv_audio_pair_info(bd_addr);
}else if(state == BT_BOND_STATE_NONE) {
bta_dm_reset_adv_audio_pairing_info(bd_addr);
+ btif_storage_remove_bonded_device(&bd_addr);
}
}