Merge changes I0baa8134,I4d94617d,I5ffa5331 into main am: d563429633 (c9308144) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/Android.bp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,6 @@ cc_library_static {
	},		},
	host_supported: true,		host_supported: true,
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	"-Wthread-safety",		"-Wthread-safety",
	],		],
	@@ -121,9 +120,6 @@ cc_test {
	"libbt_shim_bridge",		"libbt_shim_bridge",
	"libchrome",		"libchrome",
	],		],
	cflags: [
	"-DBUILDCFG",
	],
	header_libs: ["libbluetooth_headers"],		header_libs: ["libbluetooth_headers"],
	}		}

	@@ -139,7 +135,6 @@ cc_test {
	"mts_defaults",		"mts_defaults",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-DUNIT_TESTS",		"-DUNIT_TESTS",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],

system/bta/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ cc_defaults {
	generated_headers: [		generated_headers: [
	"BluetoothGeneratedDumpsysDataSchema_h",		"BluetoothGeneratedDumpsysDataSchema_h",
	],		],
	cflags: ["-DBUILDCFG"],
	}		}

	filegroup {		filegroup {

system/bta/dm/bta_dm_sec.cc

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -557,20 +557,16 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event,
	break;		break;

	case BTM_SP_LOC_OOB_EVT:		case BTM_SP_LOC_OOB_EVT:
	#ifdef BTIF_DM_OOB_TEST
	btif_dm_proc_loc_oob(BT_TRANSPORT_BR_EDR,		btif_dm_proc_loc_oob(BT_TRANSPORT_BR_EDR,
	(bool)(p_data->loc_oob.status == BTM_SUCCESS),		(bool)(p_data->loc_oob.status == BTM_SUCCESS),
	p_data->loc_oob.c, p_data->loc_oob.r);		p_data->loc_oob.c, p_data->loc_oob.r);
	#endif
	break;		break;

	case BTM_SP_RMT_OOB_EVT: {		case BTM_SP_RMT_OOB_EVT: {
	Octet16 c;		Octet16 c;
	Octet16 r;		Octet16 r;
	sp_rmt_result = false;		sp_rmt_result = false;
	#ifdef BTIF_DM_OOB_TEST
	sp_rmt_result = btif_dm_proc_rmt_oob(p_data->rmt_oob.bd_addr, &c, &r);		sp_rmt_result = btif_dm_proc_rmt_oob(p_data->rmt_oob.bd_addr, &c, &r);
	#endif
	log::verbose("result={}", sp_rmt_result);		log::verbose("result={}", sp_rmt_result);
	bta_dm_ci_rmt_oob(sp_rmt_result, p_data->rmt_oob.bd_addr, c, r);		bta_dm_ci_rmt_oob(sp_rmt_result, p_data->rmt_oob.bd_addr, c, r);
	break;		break;

system/btif/Android.bp

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -166,7 +166,6 @@ cc_library_static {
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	apex_available: [		apex_available: [
	@@ -255,7 +254,6 @@ cc_library_static {
	"libcrypto",		"libcrypto",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/		/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
	"-fvisibility=default",		"-fvisibility=default",
	@@ -364,7 +362,6 @@ cc_test {
	],		],
	},		},
	},		},
	cflags: ["-DBUILDCFG"],
	sanitize: {		sanitize: {
	integer_overflow: true,		integer_overflow: true,
	},		},
	@@ -397,7 +394,6 @@ cc_test {
	"libosi",		"libosi",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	shared_libs: ["liblog"],		shared_libs: ["liblog"],
	@@ -437,7 +433,6 @@ cc_test {
	"liblog",		"liblog",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	}		}
	@@ -487,7 +482,6 @@ cc_test {
	},		},
	},		},
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	sanitize: {		sanitize: {
	@@ -531,7 +525,6 @@ cc_test {
	"libgmock",		"libgmock",
	"libosi",		"libosi",
	],		],
	cflags: ["-DBUILDCFG"],
	target: {		target: {
	android: {		android: {
	static_libs: [		static_libs: [
	@@ -571,7 +564,6 @@ cc_test {
	"libcom.android.sysprop.bluetooth.wrapped",		"libcom.android.sysprop.bluetooth.wrapped",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	}		}
	@@ -678,7 +670,6 @@ cc_test {
	"libstatslog_bt",		"libstatslog_bt",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	target: {		target: {
	@@ -801,7 +792,6 @@ cc_test {
	"libstatslog_bt",		"libstatslog_bt",
	],		],
	cflags: [		cflags: [
	"-DBUILDCFG",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	],		],
	target: {		target: {

system/btif/include/btif_dm.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -90,14 +90,12 @@ void btif_dm_set_oob_for_io_req(tBTM_OOB_DATA* p_oob_data);
	void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,		void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,
	tBTM_OOB_DATA* p_oob_data,		tBTM_OOB_DATA* p_oob_data,
	tBTM_LE_AUTH_REQ* p_auth_req);		tBTM_LE_AUTH_REQ* p_auth_req);
	#ifdef BTIF_DM_OOB_TEST
	void btif_dm_load_local_oob(void);		void btif_dm_load_local_oob(void);
	void btif_dm_proc_loc_oob(tBT_TRANSPORT transport, bool is_valid,		void btif_dm_proc_loc_oob(tBT_TRANSPORT transport, bool is_valid,
	const Octet16& c, const Octet16& r);		const Octet16& c, const Octet16& r);
	bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,		bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,
	Octet16* p_r);		Octet16* p_r);
	void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);		void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);
	#endif /* BTIF_DM_OOB_TEST */

	void btif_dm_clear_event_filter();		void btif_dm_clear_event_filter();