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

Commit b676bd6c authored Jul 20, 2017 by Pavlin Radoslavov

Fix the interoperability mechanism for 2Mbps-only links for audio

Also, added two new entries to the INTEROP_2MBPS_LINK_ONLY
interoperability database.

Bug: 62394764
Test: Audio streaming to headset that supports 3Mbps
Change-Id: Idaa25e18c0b017d8859aab723244fdc2613fc159

parent 29ead9ab

system/bta/av/bta_av_aact.cc

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1360,7 +1360,11 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
	p = BTM_ReadRemoteFeatures(p_scb->peer_addr);		p = BTM_ReadRemoteFeatures(p_scb->peer_addr);
	if (p != NULL) {		if (p != NULL) {
	if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr \|= BTA_AV_EDR_2MBPS;		if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr \|= BTA_AV_EDR_2MBPS;
	if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) open.edr \|= BTA_AV_EDR_3MBPS;		if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) {
			if (!interop_match_addr(INTEROP_2MBPS_LINK_ONLY, &p_scb->peer_addr)) {
			open.edr \|= BTA_AV_EDR_3MBPS;
			}
			}
	}		}
	#if (BTA_AR_INCLUDED == TRUE)		#if (BTA_AR_INCLUDED == TRUE)
	bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr);		bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr);

system/device/include/interop_database.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,12 @@ static const interop_addr_entry_t interop_addr_database[] = {
	// JayBird Family		// JayBird Family
	{{{0x00, 0x18, 0x91, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},		{{{0x00, 0x18, 0x91, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},

			// Sony MBH-10
			{{{0x20, 0x15, 0x06, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},

			// Uconnect
			{{{0x9c, 0xdf, 0x03, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},

	// LG Tone HBS-730 - unacceptably loud volume		// LG Tone HBS-730 - unacceptably loud volume
	{{{0x00, 0x18, 0x6b, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},		{{{0x00, 0x18, 0x6b, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
	{{{0xb8, 0xad, 0x3e, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},		{{{0xb8, 0xad, 0x3e, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},