Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be69941d authored May 17, 2021 by Zyan Wu

Fix: give an event for AVDT_DELAY_REPORT_CFM_EVT

AVDT_DELAY_REPORT_CFM_EVT is mistakenly mapped to 0 (BTA_AV)
event. This caused crash when delay report is supported and
delay report responses have been received.

Now creating a delay report confirm event so it can be handled
later in bta av system

Bug: 188367563
Tag: #feature
Test: atest --host bluetooth_test_gd
Change-Id: Icbe01569d90abd4a881489e013a111432cf53d01

parent 5d6e8fd1

system/bta/av/bta_av_aact.cc

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ static const uint16_t bta_av_stream_evt_ok[] = {
	BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */		BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */
	BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */		BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */
	BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */		BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */
	0 /* AVDT_DELAY_REPORT_CFM_EVT */		BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */
	};		};

	static const uint16_t bta_av_stream_evt_fail[] = {		static const uint16_t bta_av_stream_evt_fail[] = {
	@@ -159,7 +159,7 @@ static const uint16_t bta_av_stream_evt_fail[] = {
	BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */		BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */
	BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */		BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */
	BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */		BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */
	0 /* AVDT_DELAY_REPORT_CFM_EVT */		BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */
	};		};

	/***********************************************		/***********************************************

system/bta/av/bta_av_int.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ enum {
	BTA_AV_AVDT_DISCONNECT_EVT,		BTA_AV_AVDT_DISCONNECT_EVT,
	BTA_AV_ROLE_CHANGE_EVT,		BTA_AV_ROLE_CHANGE_EVT,
	BTA_AV_AVDT_DELAY_RPT_EVT,		BTA_AV_AVDT_DELAY_RPT_EVT,
			BTA_AV_AVDT_DELAY_RPT_CFM_EVT,
	BTA_AV_ACP_CONNECT_EVT,		BTA_AV_ACP_CONNECT_EVT,
	BTA_AV_API_OFFLOAD_START_EVT,		BTA_AV_API_OFFLOAD_START_EVT,
	BTA_AV_API_OFFLOAD_START_RSP_EVT,		BTA_AV_API_OFFLOAD_START_RSP_EVT,