Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master (9ea633b9) · Commits · e / os / android_packages_modules_Bluetooth

system/device/include/interop_database.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -151,11 +151,17 @@ static const interop_addr_entry_t interop_addr_database[] = {
		// because BR/EDR address and ADV random address are the same
		{{{0xd4, 0x7a, 0xe2, 0, 0, 0}}, 3, INTEROP_DISABLE_NAME_REQUEST},

		// Mazda Carkit
		{{{0xfc, 0x35, 0xe6, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},

		// Toyota Car Audio
		{{{0x00, 0x17, 0x53, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},

		// Honda High End Carkit
		{{{0x9c, 0x8d, 0x7c, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},

		// Honda Civic Carkit
		{{{0x0c, 0xd9, 0xc1, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},
		};

		typedef struct {

+33 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,39 @@ cc_test {
		},
		}

		cc_test {
		name: "net_test_stack_a2dp_native",
		defaults: ["fluoride_defaults"],
		test_suites: ["device-tests"],
		host_supported: true,
		include_dirs: [
		"external/libldac/inc",
		"packages/modules/Bluetooth/system",
		"packages/modules/Bluetooth/system/stack/include",
		],
		srcs: [
		"test/a2dp/a2dp_vendor_ldac_decoder_test.cc",
		"test/a2dp/misc_fake.cc",
		],
		shared_libs: [
		"libcrypto",
		"libcutils",
		"libprotobuf-cpp-lite",
		],
		static_libs: [
		"libbt-common",
		"libbt-protos-lite",
		"liblog",
		"libosi",
		"libosi-AllocationTestHarness",
		],
		sanitize: {
		address: true,
		cfi: true,
		misc_undefined: ["bounds"],
		},
		}

		// gatt sr hash test
		cc_test {
		name: "net_test_stack_gatt_sr_hash_native",

+2 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@ static tAVRC_STS avrc_ctrl_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg,
		break;
		}
		case AVRC_PDU_REGISTER_NOTIFICATION: /* 0x31 */
		if (len < 5) return AVRC_STS_INTERNAL_ERR;

		BE_STREAM_TO_UINT8(p_result->reg_notif.event_id, p);
		BE_STREAM_TO_UINT32(p_result->reg_notif.param, p);
		break;

+7 −0

Original line number	Diff line number	Diff line
		@@ -2394,6 +2394,13 @@ void btm_sec_rmt_host_support_feat_evt(uint8_t* p) {
		*
		******************************************************************************/
		void btm_io_capabilities_req(const RawAddress& p) {
		if (btm_sec_is_a_bonded_dev(p)) {
		BTM_TRACE_WARNING(
		"%s: Incoming bond request, but %s is already bonded (removing)",
		__func__, p.ToString().c_str());
		bta_dm_process_remove_device(p);
		}

		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(p);

		if ((btm_cb.security_mode == BTM_SEC_MODE_SC) &&

+35 −30

Original line number	Diff line number	Diff line
		@@ -271,12 +271,15 @@ void SMP_SecurityGrant(const RawAddress& bd_addr, uint8_t res) {

		SMP_TRACE_EVENT("SMP_SecurityGrant ");

		// If just showing consent dialog, send response
		if (smp_cb.cb_evt == SMP_CONSENT_REQ_EVT) {
		// If JUSTWORKS, this is used to display the consent dialog
		if (smp_cb.selected_association_model == SMP_MODEL_SEC_CONN_JUSTWORKS) {
		if (res == SMP_SUCCESS) {
		smp_sm_event(&smp_cb, SMP_SC_NC_OK_EVT, NULL);
		} else {
		SMP_TRACE_WARNING("%s() - Consent dialog fails for JUSTWORKS", __func__);
		SMP_TRACE_WARNING("%s() - Consent dialog fails for JUSTWORKS",
		__func__);
		/* send pairing failure */
		tSMP_INT_DATA smp_int_data;
		smp_int_data.status = SMP_NUMERIC_COMPAR_FAIL;
		@@ -303,6 +306,8 @@ void SMP_SecurityGrant(const RawAddress& bd_addr, uint8_t res) {
		smp_sm_event(&smp_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
		}
		}
		return;
		}

		if (smp_cb.smp_over_br) {
		if (smp_cb.br_state != SMP_BR_STATE_WAIT_APP_RSP \|\|