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

Commit 1ac3b366 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge "Get rid of "services" parameter to start search request" into main

parents b5594d46 e3641ed3

system/bta/dm/bta_dm_disc.cc

+4 −4
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void bta_dm_search_start(tBTA_DM_API_SEARCH& search) { 
  get_btm_client_interface().db.BTM_ClearInqDb(nullptr);

  /* save search params */

  bta_dm_search_cb.p_device_search_cback = search.p_cback;

  bta_dm_search_cb.services = search.services;

  bta_dm_search_cb.services = 0; /* device search, do not discover services */



  const tBTM_STATUS btm_status =

      BTM_StartInquiry(bta_dm_inq_results_cb, bta_dm_inq_cmpl_cb);
@@ -2345,9 +2345,9 @@ void bta_dm_disc_acl_down(const RawAddress& bd_addr, tBT_TRANSPORT transport) { 
void bta_dm_disc_stop() { bta_dm_disc_reset(); }



void bta_dm_disc_start_device_discovery(tBTA_DM_SEARCH_CBACK* p_cback) {

  bta_dm_search_sm_execute(BTA_DM_API_SEARCH_EVT,

                           std::make_unique<tBTA_DM_MSG>(tBTA_DM_API_SEARCH{

                               .services = 0, .p_cback = p_cback}));

  bta_dm_search_sm_execute(

      BTA_DM_API_SEARCH_EVT,

      std::make_unique<tBTA_DM_MSG>(tBTA_DM_API_SEARCH{.p_cback = p_cback}));

}



void bta_dm_disc_stop_device_discovery() {

system/bta/dm/bta_dm_disc_int.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ inline std::string bta_dm_event_text(const tBTA_DM_EVT& event) { 


/* data type for BTA_DM_API_SEARCH_EVT */

typedef struct {

  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

} tBTA_DM_API_SEARCH;