diff options
| author | Hui Peng <phui@google.com> | 2023-05-05 00:42:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-17 19:37:52 +0000 |
| commit | 108cb7688d0a9f0f532cb4cd82afdc69a04fd5c0 (patch) | |
| tree | 91de38948414384dd80504503d33a557add8d927 | |
| parent | 17e6d38dd0b50850bad3c608943c6a6865ac0b82 (diff) | |
| download | bt-108cb7688d0a9f0f532cb4cd82afdc69a04fd5c0.tar.gz | |
[conflict resolved] Merge "Fix a type confusion bug in bta_av_setconfig_rej" into rvc-dev am: 595218098a am: 569663e50a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/22939797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e662f207536ae1a368db159d8522ebb33f07f70)
Merged-In: I569ca8663f08f726b120bb6462c1cff7476d10f0
Change-Id: I569ca8663f08f726b120bb6462c1cff7476d10f0
| -rw-r--r-- | bta/av/bta_av_aact.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc index 5c78afb67..93970b846 100644 --- a/bta/av/bta_av_aact.cc +++ b/bta/av/bta_av_aact.cc @@ -1741,14 +1741,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, 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); + 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); AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0); - reject.bd_addr = p_data->str_msg.bd_addr; + reject.bd_addr = p_scb->PeerAddress(); reject.hndl = p_scb->hndl; tBTA_AV bta_av_data; |