Skip to content

Commit dc66940

Browse files
committed
Merge branch 'bugfix/btdm_a2dp_disc_rsn_error_when_as_master' into 'master'
component/bt: Fix bug: a2dp disc_rsn error when as master See merge request idf/esp-idf!1995
2 parents 488268d + f1d3f68 commit dc66940

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

components/bt/bluedroid/bta/av/bta_av_aact.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,9 @@ static void bta_av_proc_stream_evt(UINT8 handle, BD_ADDR bd_addr, UINT8 event, t
514514
p_msg->disc_rsn = p_data->hdr.err_param;
515515
break;
516516
*/
517+
case AVDT_DISCONNECT_IND_EVT:
518+
p_msg->hdr.offset = p_data->hdr.err_param;
519+
break;
517520
default:
518521
break;
519522
}

components/bt/bluedroid/bta/av/bta_av_main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,9 +1239,10 @@ BOOLEAN bta_av_hdl_event(BT_HDR *p_msg)
12391239
bta_av_sm_execute(&bta_av_cb, p_msg->event, (tBTA_AV_DATA *) p_msg);
12401240
} else {
12411241
APPL_TRACE_VERBOSE("handle=0x%x\n", p_msg->layer_specific);
1242+
tBTA_AV_SCB *p_scb = bta_av_hndl_to_scb(p_msg->layer_specific);
1243+
p_scb->disc_rsn = p_msg->offset;
12421244
/* stream state machine events */
1243-
bta_av_ssm_execute( bta_av_hndl_to_scb(p_msg->layer_specific),
1244-
p_msg->event, (tBTA_AV_DATA *) p_msg);
1245+
bta_av_ssm_execute(p_scb, p_msg->event, (tBTA_AV_DATA *) p_msg);
12451246
}
12461247
return TRUE;
12471248
}

0 commit comments

Comments
 (0)