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

Commit 58731491 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Replace BD_ADDR with bt_bdaddr_t in SDP and A2DP related code 

am: cf5b8e1c

Change-Id: I0b233b1c26cfdc2e34a54829f5225051e40ff19f
parents d2f32d5c cf5b8e1c

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
  if (db_inited) {

    /*Service discovery not initiated */

    db_inited = SDP_ServiceSearchAttributeRequest(

        to_BD_ADDR(p_scb->peer_addr), p_scb->p_disc_db,

        p_scb->peer_addr, p_scb->p_disc_db,

        bta_ag_sdp_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1]);

  }

system/bta/av/bta_av_aact.cc

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  APPL_TRACE_DEBUG("%s: uuid_int 0x%x, Doing SDP For 0x%x", __func__,

                   p_scb->uuid_int, sdp_uuid);

  if (A2DP_FindService(sdp_uuid, to_BD_ADDR(p_scb->peer_addr), &db_params,

  if (A2DP_FindService(sdp_uuid, p_scb->peer_addr, &db_params,

                       bta_av_a2dp_sdp_cback) == A2DP_SUCCESS)

    return;

system/bta/dm/bta_dm_act.cc

+3 −4
Original line number Diff line number Diff line
@@ -1328,8 +1328,8 @@ void bta_dm_di_disc(tBTA_DM_MSG* p_data) { 


  bta_dm_search_cb.p_sdp_db =

      (tSDP_DISCOVERY_DB*)osi_malloc(BTA_DM_SDP_DB_SIZE);

  if (SDP_DiDiscover(to_BD_ADDR(bta_dm_search_cb.peer_bdaddr),

                     p_data->di_disc.p_sdp_db, p_data->di_disc.len,

  if (SDP_DiDiscover(bta_dm_search_cb.peer_bdaddr, p_data->di_disc.p_sdp_db,

                     p_data->di_disc.len,

                     bta_dm_di_disc_callback) == SDP_SUCCESS) {

    result = BTA_SUCCESS;

  }
@@ -1984,8 +1984,7 @@ static void bta_dm_find_services(const bt_bdaddr_t& bd_addr) { 


      bta_dm_search_cb.p_sdp_db->raw_size = MAX_DISC_RAW_DATA_BUF;



      if (!SDP_ServiceSearchAttributeRequest(to_BD_ADDR(bd_addr),

                                             bta_dm_search_cb.p_sdp_db,

      if (!SDP_ServiceSearchAttributeRequest(bd_addr, bta_dm_search_cb.p_sdp_db,

                                             &bta_dm_sdp_callback)) {

        /*

         * If discovery is not successful with this device, then

system/bta/gatt/bta_gattc_cache.cc

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static tBTA_GATT_STATUS bta_gattc_sdp_service_disc( 
  SDP_InitDiscoveryDb(cb_data->p_sdp_db, BTA_GATT_SDP_DB_SIZE, 1, &uuid,

                      num_attrs, attr_list);



  if (!SDP_ServiceSearchAttributeRequest2(p_server_cb->server_bda.address,

  if (!SDP_ServiceSearchAttributeRequest2(p_server_cb->server_bda,

                                          cb_data->p_sdp_db,

                                          &bta_gattc_sdp_callback, cb_data)) {

    osi_free(cb_data->p_sdp_db);

system/bta/hf_client/bta_hf_client_sdp.cc

+19 −19
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ void bta_hf_client_do_disc(tBTA_HF_CLIENT_CB* client_cb) { 
  if (db_inited) {

    /*Service discovery not initiated */

    db_inited = SDP_ServiceSearchAttributeRequest2(

        to_BD_ADDR(client_cb->peer_addr), client_cb->p_disc_db,

        bta_hf_client_sdp_cback, (void*)client_cb);

        client_cb->peer_addr, client_cb->p_disc_db, bta_hf_client_sdp_cback,

        (void*)client_cb);

  }



  if (!db_inited) {