Merge "IA2: bta::av Use proper sdp API get_legacy_stack_sdp_api am: 3f2310eeeb... (84297621) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_act.cc

+6 −5

Original line number	Diff line number	Diff line
		@@ -2163,14 +2163,15 @@ void bta_av_rc_disc_done_all(UNUSED_ATTR tBTA_AV_DATA* p_data) {

		/* Change our features if the remote AVRCP version is 1.3 or less */
		tSDP_DISC_REC* p_rec = nullptr;
		p_rec = SDP_FindServiceInDb(p_cb->p_disc_db,
		UUID_SERVCLASS_AV_REMOTE_CONTROL, p_rec);
		p_rec = get_legacy_stack_sdp_api()->db.SDP_FindServiceInDb(
		p_cb->p_disc_db, UUID_SERVCLASS_AV_REMOTE_CONTROL, p_rec);
		if (p_rec != NULL &&
		SDP_FindAttributeInRec(p_rec, ATTR_ID_BT_PROFILE_DESC_LIST) != NULL) {
		get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(
		p_rec, ATTR_ID_BT_PROFILE_DESC_LIST) != NULL) {
		/* get profile version (if failure, version parameter is not updated) */
		uint16_t peer_rc_version = 0xFFFF; // Don't change the AVRCP version
		SDP_FindProfileVersionInRec(p_rec, UUID_SERVCLASS_AV_REMOTE_CONTROL,
		&peer_rc_version);
		get_legacy_stack_sdp_api()->record.SDP_FindProfileVersionInRec(
		p_rec, UUID_SERVCLASS_AV_REMOTE_CONTROL, &peer_rc_version);
		if (peer_rc_version <= AVRC_REV_1_3) {
		APPL_TRACE_DEBUG("%s: Using AVRCP 1.3 Capabilities with remote device",
		__func__);