Merge "stack::sdp Class enum-ify tSDP_STATUS" into main (472ed9de) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+7 −4

Original line number	Diff line number	Diff line
		@@ -237,7 +237,8 @@ void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		log::verbose("bta_ag_disc_int_res: Status: {}", data.disc_result.status);

		/* if found service */
		if (data.disc_result.status == SDP_SUCCESS \|\| data.disc_result.status == SDP_DB_FULL) {
		if (data.disc_result.status == tSDP_STATUS::SDP_SUCCESS \|\|
		data.disc_result.status == tSDP_STATUS::SDP_DB_FULL) {
		/* get attributes */
		if (bta_ag_sdp_find_attr(p_scb, p_scb->open_services)) {
		/* set connected service */
		@@ -256,8 +257,9 @@ void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {

		/* if service not found check if we should search for other service */
		if ((event == BTA_AG_DISC_FAIL_EVT) &&
		(data.disc_result.status == SDP_SUCCESS \|\| data.disc_result.status == SDP_DB_FULL \|\|
		data.disc_result.status == SDP_NO_RECS_MATCH)) {
		(data.disc_result.status == tSDP_STATUS::SDP_SUCCESS \|\|
		data.disc_result.status == tSDP_STATUS::SDP_DB_FULL \|\|
		data.disc_result.status == tSDP_STATUS::SDP_NO_RECS_MATCH)) {
		if ((p_scb->open_services & BTA_HFP_SERVICE_MASK) &&
		(p_scb->open_services & BTA_HSP_SERVICE_MASK)) {
		/* search for HSP */
		@@ -290,7 +292,8 @@ void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		******************************************************************************/
		void bta_ag_disc_acp_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		/* if found service */
		if (data.disc_result.status == SDP_SUCCESS \|\| data.disc_result.status == SDP_DB_FULL) {
		if (data.disc_result.status == tSDP_STATUS::SDP_SUCCESS \|\|
		data.disc_result.status == tSDP_STATUS::SDP_DB_FULL) {
		/* get attributes */
		bta_ag_sdp_find_attr(p_scb, bta_ag_svc_mask[p_scb->conn_service]);
		DEVICE_IOT_CONFIG_ADDR_SET_HEX_IF_GREATER(p_scb->peer_addr, IOT_CONF_KEY_HFP_VERSION,

system/bta/dm/bta_dm_api.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,8 +140,8 @@ tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info, uint32_t* p_ha
		tBTA_STATUS status = BTA_FAILURE;

		if (bta_dm_di_cb.di_num < BTA_DI_NUM_MAX) {
		if (get_legacy_stack_sdp_api()->device_id.SDP_SetLocalDiRecord((tSDP_DI_RECORD*)p_device_info,
		p_handle) == SDP_SUCCESS) {
		if (get_legacy_stack_sdp_api()->device_id.SDP_SetLocalDiRecord(
		(tSDP_DI_RECORD*)p_device_info, p_handle) == tSDP_STATUS::SDP_SUCCESS) {
		if (!p_device_info->primary_record) {
		bta_dm_di_cb.di_handle[bta_dm_di_cb.di_num] = *p_handle;
		bta_dm_di_cb.di_num++;

system/bta/dm/bta_dm_disc_legacy.cc

+5 −4

Original line number	Diff line number	Diff line
		@@ -584,8 +584,9 @@ static void bta_dm_sdp_result(tBTA_DM_SDP_RESULT& sdp_event) {

		const tSDP_RESULT sdp_result = sdp_event.sdp_result;

		if ((sdp_event.sdp_result == SDP_SUCCESS) \|\| (sdp_event.sdp_result == SDP_NO_RECS_MATCH) \|\|
		(sdp_event.sdp_result == SDP_DB_FULL)) {
		if ((sdp_event.sdp_result == tSDP_STATUS::SDP_SUCCESS) \|\|
		(sdp_event.sdp_result == tSDP_STATUS::SDP_NO_RECS_MATCH) \|\|
		(sdp_event.sdp_result == tSDP_STATUS::SDP_DB_FULL)) {
		log::verbose("sdp_result::0x{:x}", sdp_event.sdp_result);
		do {
		p_sdp_rec = NULL;
		@@ -676,7 +677,7 @@ static void bta_dm_sdp_result(tBTA_DM_SDP_RESULT& sdp_event) {
		#if TARGET_FLOSS
		tSDP_DI_GET_RECORD di_record;
		if (get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(
		1, &di_record, bta_dm_search_cb.p_sdp_db) == SDP_SUCCESS) {
		1, &di_record, bta_dm_search_cb.p_sdp_db) == tSDP_STATUS::SDP_SUCCESS) {
		bta_dm_search_cb.service_search_cbacks.on_did_received(
		bta_dm_search_cb.peer_bdaddr, di_record.rec.vendor_id_source, di_record.rec.vendor,
		di_record.rec.product, di_record.rec.version);
		@@ -739,7 +740,7 @@ static void bta_dm_sdp_result(tBTA_DM_SDP_RESULT& sdp_event) {
		BTM_LogHistory(kBtmLogTag, bta_dm_search_cb.peer_bdaddr, "Discovery failed",
		base::StringPrintf("Result:%s", sdp_result_text(sdp_result).c_str()));
		log::error("SDP connection failed {}", sdp_status_text(sdp_result));
		if (sdp_event.sdp_result == SDP_CONN_FAILED) {
		if (sdp_event.sdp_result == tSDP_STATUS::SDP_CONN_FAILED) {
		bta_dm_search_cb.wait_disc = false;
		}

system/bta/dm/bta_dm_disc_sdp.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -163,8 +163,8 @@ void bta_dm_sdp_result(tSDP_STATUS sdp_result, tBTA_DM_SDP_STATE* sdp_state) {
		std::vector<Uuid> uuid_list;
		tSDP_DISCOVERY_DB* p_sdp_db = (tSDP_DISCOVERY_DB*)sdp_state->sdp_db_buffer;

		if ((sdp_result == SDP_SUCCESS) \|\| (sdp_result == SDP_NO_RECS_MATCH) \|\|
		(sdp_result == SDP_DB_FULL)) {
		if ((sdp_result == tSDP_STATUS::SDP_SUCCESS) \|\| (sdp_result == tSDP_STATUS::SDP_NO_RECS_MATCH) \|\|
		(sdp_result == tSDP_STATUS::SDP_DB_FULL)) {
		log::verbose("sdp_result::0x{:x}", sdp_result);
		std::vector<Uuid> gatt_uuids;
		do {
		@@ -241,7 +241,7 @@ void bta_dm_sdp_result(tSDP_STATUS sdp_result, tBTA_DM_SDP_STATE* sdp_state) {
		#if TARGET_FLOSS
		tSDP_DI_GET_RECORD di_record;
		if (get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(1, &di_record, p_sdp_db) ==
		SDP_SUCCESS) {
		tSDP_STATUS::SDP_SUCCESS) {
		bta_dm_sdp_received_di(sdp_state->bd_addr, di_record);
		}
		#endif

system/bta/gatt/bta_gattc_cache.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ void bta_gattc_sdp_callback(tBTA_GATTC_CB_DATA* cb_data, const RawAddress& /* bd
		return;
		}

		if ((sdp_status != SDP_SUCCESS) && (sdp_status != SDP_DB_FULL)) {
		if ((sdp_status != tSDP_STATUS::SDP_SUCCESS) && (sdp_status != tSDP_STATUS::SDP_DB_FULL)) {
		bta_gattc_explore_srvc_finished(cb_data->sdp_conn_id, p_srvc_cb);

		/* allocated in bta_gattc_sdp_service_disc */