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

Commit f3ca5628 authored May 07, 2024 by Chris Manton

stack::sdp [2/12] service.SDP_CancelServiceSearch

Bug: 339311914
Test: m .
Flag: EXEMPT, Logging Change

Change-Id: I5b1b827cca7d7e68c5c84d3cf084fe321b2aaeb6

parent 25ee8699

system/bta/ag/bta_ag_act.cc

+5 −2

Original line number	Diff line number	Diff line
		@@ -905,8 +905,11 @@ void bta_ag_handle_collision(tBTA_AG_SCB* p_scb,
		const tBTA_AG_DATA& /* data */) {
		/* Cancel SDP if it had been started. */
		if (p_scb->p_disc_db) {
		get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(
		p_scb->p_disc_db);
		if (!get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(
		p_scb->p_disc_db)) {
		log::warn("Unable to cancel SDP service discovery search peer:{}",
		p_scb->peer_addr);
		}
		bta_ag_free_db(p_scb, tBTA_AG_DATA::kEmpty);
		}

system/bta/hf_client/bta_hf_client_main.cc

+4 −2

Original line number	Diff line number	Diff line
		@@ -389,8 +389,10 @@ void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS /* status */,

		/* Cancel SDP if it had been started. */
		if (client_cb->p_disc_db) {
		get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(
		client_cb->p_disc_db);
		if (!get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(
		client_cb->p_disc_db)) {
		log::warn("Unable to cancel SDP service discovery peer:{}", peer_addr);
		}
		osi_free_and_reset((void**)&client_cb->p_disc_db);
		}