Merge "Parse the headers before profile id extraction" into main (838d2564) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/Android.bp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ cc_library_static {
	"pan/pan_utils.cc",		"pan/pan_utils.cc",
	],		],
	static_libs: [		static_libs: [
			"bluetooth_flags_c_lib",
	"libbluetooth_crypto_toolbox",		"libbluetooth_crypto_toolbox",
	"libbluetooth_hci_pdl",		"libbluetooth_hci_pdl",
	"libbluetooth_log",		"libbluetooth_log",
	@@ -597,7 +598,11 @@ cc_fuzz {
	"avrc/*.cc",		"avrc/*.cc",
	"fuzzers/avrc_fuzzer.cc",		"fuzzers/avrc_fuzzer.cc",
	],		],
			shared_libs: [
			"server_configurable_flags",
			],
	static_libs: [		static_libs: [
			"bluetooth_flags_c_lib",
	"libbase",		"libbase",
	"libbluetooth-types",		"libbluetooth-types",
	"libbluetooth_hci_pdl",		"libbluetooth_hci_pdl",

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	* This module contains action functions of the link control state machine.		* This module contains action functions of the link control state machine.
	*		*
	******************************************************************************/		******************************************************************************/
			#include <android_bluetooth_flags.h>
	#include <android_bluetooth_sysprop.h>		#include <android_bluetooth_sysprop.h>
	#include <bluetooth/log.h>		#include <bluetooth/log.h>
	#include <string.h>		#include <string.h>
	@@ -718,9 +719,12 @@ bool avct_msg_ind_for_src_sink_coexist(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data,
	tAVCT_CCB* p_ccb;		tAVCT_CCB* p_ccb;
	int p_buf_len;		int p_buf_len;
	uint8_t* p;		uint8_t* p;
	uint16_t pid;		uint16_t pid, type;

	p = (uint8_t*)(p_data->p_buf + 1) + p_data->p_buf->offset;		p = (uint8_t*)(p_data->p_buf + 1) + p_data->p_buf->offset;
			if (IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) {
			AVCT_PARSE_HDR(p, label, type, cr_ipid);
			}

	BE_STREAM_TO_UINT16(pid, p);		BE_STREAM_TO_UINT16(pid, p);