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

Commit b582f8a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iac5bc982,I90c66a3b,I4ed5973b,I5173b895,I28420a70, ... am: 8ebd6d92 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1676595

Change-Id: I439a6d16dd9a308dbce8e501b34bdd38d837abdc
parents 2c1d5dc3 8ebd6d92

system/bta/ag/bta_ag_sdp.cc

+12 −12
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ using bluetooth::Uuid; 
#endif



/* declare sdp callback functions */

void bta_ag_sdp_cback_1(uint16_t status);

void bta_ag_sdp_cback_2(uint16_t status);

void bta_ag_sdp_cback_3(uint16_t status);

void bta_ag_sdp_cback_4(uint16_t status);

void bta_ag_sdp_cback_5(uint16_t status);

void bta_ag_sdp_cback_6(uint16_t status);

void bta_ag_sdp_cback_1(tSDP_RESULT);

void bta_ag_sdp_cback_2(tSDP_RESULT);

void bta_ag_sdp_cback_3(tSDP_RESULT);

void bta_ag_sdp_cback_4(tSDP_RESULT);

void bta_ag_sdp_cback_5(tSDP_RESULT);

void bta_ag_sdp_cback_6(tSDP_RESULT);



/* SDP callback function table */

typedef tSDP_DISC_CMPL_CB* tBTA_AG_SDP_CBACK;
@@ -102,12 +102,12 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) { 
 * Returns          void

 *

 ******************************************************************************/

void bta_ag_sdp_cback_1(uint16_t status) { bta_ag_sdp_cback(status, 1); }

void bta_ag_sdp_cback_2(uint16_t status) { bta_ag_sdp_cback(status, 2); }

void bta_ag_sdp_cback_3(uint16_t status) { bta_ag_sdp_cback(status, 3); }

void bta_ag_sdp_cback_4(uint16_t status) { bta_ag_sdp_cback(status, 4); }

void bta_ag_sdp_cback_5(uint16_t status) { bta_ag_sdp_cback(status, 5); }

void bta_ag_sdp_cback_6(uint16_t status) { bta_ag_sdp_cback(status, 6); }

void bta_ag_sdp_cback_1(tSDP_STATUS status) { bta_ag_sdp_cback(status, 1); }

void bta_ag_sdp_cback_2(tSDP_STATUS status) { bta_ag_sdp_cback(status, 2); }

void bta_ag_sdp_cback_3(tSDP_STATUS status) { bta_ag_sdp_cback(status, 3); }

void bta_ag_sdp_cback_4(tSDP_STATUS status) { bta_ag_sdp_cback(status, 4); }

void bta_ag_sdp_cback_5(tSDP_STATUS status) { bta_ag_sdp_cback(status, 5); }

void bta_ag_sdp_cback_6(tSDP_STATUS status) { bta_ag_sdp_cback(status, 6); }



/******************************************************************************

 *

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 
static void bta_dm_remname_cback(void* p);

static void bta_dm_find_services(const RawAddress& bd_addr);

static void bta_dm_discover_next_device(void);

static void bta_dm_sdp_callback(uint16_t sdp_status);

static void bta_dm_sdp_callback(tSDP_STATUS sdp_status);

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                BD_NAME bd_name, bool min_16_digit);

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
@@ -1741,12 +1741,12 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
 * Returns          void

 *

 ******************************************************************************/

static void bta_dm_sdp_callback(uint16_t sdp_status) {

static void bta_dm_sdp_callback(tSDP_STATUS sdp_status) {

  tBTA_DM_SDP_RESULT* p_msg =

      (tBTA_DM_SDP_RESULT*)osi_malloc(sizeof(tBTA_DM_SDP_RESULT));



  p_msg->hdr.event = BTA_DM_SDP_RESULT_EVT;

  p_msg->sdp_result = sdp_status;

  p_msg->sdp_result = static_cast<uint16_t>(sdp_status);



  bta_sys_sendmsg(p_msg);

}

system/bta/gatt/bta_gattc_cache.cc

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ descriptor_discovery_done: 
}



/* Process the discovery result from sdp */

void bta_gattc_sdp_callback(uint16_t sdp_status, void* user_data) {

void bta_gattc_sdp_callback(tSDP_STATUS sdp_status, void* user_data) {

  tBTA_GATTC_CB_DATA* cb_data = (tBTA_GATTC_CB_DATA*)user_data;

  tBTA_GATTC_SERV* p_srvc_cb = bta_gattc_find_scb_by_cid(cb_data->sdp_conn_id);

system/bta/hf_client/bta_hf_client_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ using bluetooth::Uuid; 
 * Returns          void

 *

 ******************************************************************************/

static void bta_hf_client_sdp_cback(uint16_t status, void* data) {

static void bta_hf_client_sdp_cback(tSDP_STATUS status, void* data) {

  uint16_t event;

  tBTA_HF_CLIENT_DISC_RESULT* p_buf = (tBTA_HF_CLIENT_DISC_RESULT*)osi_malloc(

      sizeof(tBTA_HF_CLIENT_DISC_RESULT));

system/bta/hh/bta_hh_act.cc

+3 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void bta_hh_sdp_cback(uint16_t result, uint16_t attr_mask, 
 * Returns          void

 *

 ******************************************************************************/

static void bta_hh_di_sdp_cback(uint16_t result) {

static void bta_hh_di_sdp_cback(tSDP_RESULT result) {

  tBTA_HH_DEV_CB* p_cb = bta_hh_cb.p_cur;

  tBTA_HH_STATUS status = BTA_HH_ERR_SDP;

  tSDP_DI_GET_RECORD di_rec;
@@ -401,6 +401,8 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 *

 ******************************************************************************/

void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

  CHECK(p_data != nullptr);



  tBTA_HH_CONN conn_dat;

  tBTA_HH_STATUS status = p_data->status;