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

Commit fe863355 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Fold services into BTA_DmSearch, it's always 0 am: 23f3724d 

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

Change-Id: I229444416a79acb59b56b5d2daf54d42e563f39a
parents 1f051b00 23f3724d

system/bta/dm/bta_dm_api.cc

+1 −3
Original line number Diff line number Diff line
@@ -84,14 +84,12 @@ void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode) { 
 * Returns          void

 *

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

void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK services,

                  tBTA_DM_SEARCH_CBACK* p_cback) {

void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_DM_SEARCH_CBACK* p_cback) {

  tBTA_DM_API_SEARCH* p_msg =

      (tBTA_DM_API_SEARCH*)osi_calloc(sizeof(tBTA_DM_API_SEARCH));



  p_msg->hdr.event = BTA_DM_API_SEARCH_EVT;

  memcpy(&p_msg->inq_params, p_dm_inq, sizeof(tBTA_DM_INQ));

  p_msg->services = services;

  p_msg->p_cback = p_cback;



  bta_sys_sendmsg(p_msg);

system/bta/include/bta_api.h

+1 −2
Original line number Diff line number Diff line
@@ -942,8 +942,7 @@ extern void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode); 
 * Returns          void

 *

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

extern void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK services,

                         tBTA_DM_SEARCH_CBACK* p_cback);

extern void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_DM_SEARCH_CBACK* p_cback);



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

 *

system/btif/src/btif_dm.cc

+1 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,6 @@ static void bte_scan_filt_param_cfg_evt(uint8_t ref_value, uint8_t avbl_space, 
 ******************************************************************************/

void btif_dm_start_discovery(void) {

  tBTA_DM_INQ inq_params;

  tBTA_SERVICE_MASK services = 0;



  BTIF_TRACE_EVENT("%s", __func__);
@@ -1868,7 +1867,7 @@ void btif_dm_start_discovery(void) { 
  /* Will be enabled to true once inquiry busy level has been received */

  btif_dm_inquiry_in_progress = false;

  /* find nearby devices */

  BTA_DmSearch(&inq_params, services, btif_dm_search_devices_evt);

  BTA_DmSearch(&inq_params, btif_dm_search_devices_evt);

}



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