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

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

Push BTA_ALL_SERVICE_MASK further into DmDiscover am: bcb9b5f7 

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

Change-Id: I322382c2cfff2e0f1af60b2a188ccadd87636e57
parents 596576f6 bcb9b5f7

system/bta/dm/bta_dm_act.cc

+1 −4
Original line number Diff line number Diff line
@@ -864,11 +864,8 @@ void bta_dm_search_cancel() { 
 *

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

void bta_dm_discover(tBTA_DM_MSG* p_data) {

  APPL_TRACE_EVENT("%s services_to_search=0x%04X", __func__,

                   p_data->discover.services);



  /* save the search condition */

  bta_dm_search_cb.services = p_data->discover.services;

  bta_dm_search_cb.services = BTA_ALL_SERVICE_MASK;



  bta_dm_gattc_register();

system/bta/dm/bta_dm_api.cc

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_DM_SEARCH_CBACK* p_cback, 


  p_msg->hdr.event = BTA_DM_API_DISCOVER_EVT;

  p_msg->bd_addr = bd_addr;

  p_msg->services = BTA_ALL_SERVICE_MASK;

  p_msg->transport = transport;

  p_msg->p_cback = p_cback;

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ typedef struct { 
typedef struct {

  BT_HDR hdr;

  RawAddress bd_addr;

  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

  tBT_TRANSPORT transport;

} tBTA_DM_API_DISCOVER;