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

Commit 59988c34 authored by Zach Johnson's avatar Zach Johnson
Browse files

the service mask is always the same for BTA_DmDiscover 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I95ca0baa189308f3696fb9979487720258eb3505
parent 128163b1

system/bta/dm/bta_dm_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -135,14 +135,14 @@ void BTA_DmSearchCancel(void) { 
 * Returns          void

 *

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

void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_SERVICE_MASK services,

                    tBTA_DM_SEARCH_CBACK* p_cback, tBT_TRANSPORT transport) {

void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_DM_SEARCH_CBACK* p_cback,

                    tBT_TRANSPORT transport) {

  tBTA_DM_API_DISCOVER* p_msg =

      (tBTA_DM_API_DISCOVER*)osi_calloc(sizeof(tBTA_DM_API_DISCOVER));



  p_msg->hdr.event = BTA_DM_API_DISCOVER_EVT;

  p_msg->bd_addr = bd_addr;

  p_msg->services = services;

  p_msg->services = BTA_ALL_SERVICE_MASK;

  p_msg->transport = transport;

  p_msg->p_cback = p_cback;

system/bta/include/bta_api.h

+0 −1
Original line number Diff line number Diff line
@@ -905,7 +905,6 @@ extern void BTA_DmSearchCancel(void); 
 *

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

extern void BTA_DmDiscover(const RawAddress& bd_addr,

                           tBTA_SERVICE_MASK services,

                           tBTA_DM_SEARCH_CBACK* p_cback,

                           tBT_TRANSPORT transport);

system/btif/src/btif_dm.cc

+2 −3
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t* prop) { 
void btif_dm_get_remote_services(const RawAddress remote_addr) {

  BTIF_TRACE_EVENT("%s: bd_addr=%s", __func__, remote_addr.ToString().c_str());



  BTA_DmDiscover(remote_addr, BTA_ALL_SERVICE_MASK, btif_dm_search_services_evt,

  BTA_DmDiscover(remote_addr, btif_dm_search_services_evt,

                 BT_TRANSPORT_UNKNOWN);

}
@@ -2163,8 +2163,7 @@ bt_status_t btif_dm_get_remote_services_by_transport(RawAddress* remote_addr, 
  BTIF_TRACE_EVENT("%s: transport=%d, remote_addr=%s", __func__, transport,

                   remote_addr->ToString().c_str());



  BTA_DmDiscover(*remote_addr, BTA_ALL_SERVICE_MASK,

                 btif_dm_search_services_evt, transport);

  BTA_DmDiscover(*remote_addr, btif_dm_search_services_evt, transport);



  return BT_STATUS_SUCCESS;

}