aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-09 20:41:25 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-09 20:41:25 +0000
commit716edfca229fe52439916e319a90379ea851f063 (patch)
treece386c74777c77ee38691d028229d45a647625d8
parent06c1929e65000a5690585b14c291ea33392a4ddc (diff)
parent42b92b0f7f40f349f94a6195ca22130cc2241ce1 (diff)
downloadbt-716edfca229fe52439916e319a90379ea851f063.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24298359'] into sc-v2-platform-release.android-platform-12.1.0_r19
Change-Id: Iaa929ba5944d9da62ebf072377cac096309fa0c4
-rw-r--r--bta/av/bta_av_aact.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc
index 2eb1d6303..33298d649 100644
--- a/bta/av/bta_av_aact.cc
+++ b/bta/av/bta_av_aact.cc
@@ -1737,14 +1737,14 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
******************************************************************************/
void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
tBTA_AV_REJECT reject;
+ uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;
- bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);
-
- LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
- p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);
+ bta_av_adjust_seps_idx(p_scb, avdt_handle);
+ LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
+ p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);
AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);
- reject.bd_addr = p_scb->PeerAddress();
+ reject.bd_addr = p_data->str_msg.bd_addr;
reject.hndl = p_scb->hndl;
tBTA_AV bta_av_data;