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

Commit c3cc8935 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use Bind in BTA_JvCreateRecordByUser 

Bug: 68359837
Test: compilation test
Change-Id: I889467b07694b16485a7541c4d9fdfa38a47e0be
parent 505bad3b

system/bta/jv/bta_jv_act.cc

+3 −12
Original line number Diff line number Diff line
@@ -842,24 +842,15 @@ void bta_jv_start_discovery(tBTA_JV_MSG* p_data) { 
  */

}



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

 *

 * Function     bta_jv_create_record

 *

 * Description  Create an SDP record with the given attributes

 *

 * Returns      void

 *

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

void bta_jv_create_record(tBTA_JV_MSG* p_data) {

  tBTA_JV_API_CREATE_RECORD* cr = &(p_data->create_record);

/* Create an SDP record with the given attributes */

void bta_jv_create_record(uint32_t rfcomm_slot_id) {

  tBTA_JV_CREATE_RECORD evt_data;

  evt_data.status = BTA_JV_SUCCESS;

  if (bta_jv_cb.p_dm_cback) {

    // callback immediately to create the sdp record in stack thread context

    tBTA_JV bta_jv;

    bta_jv.create_rec = evt_data;

    bta_jv_cb.p_dm_cback(BTA_JV_CREATE_RECORD_EVT, &bta_jv, cr->rfcomm_slot_id);

    bta_jv_cb.p_dm_cback(BTA_JV_CREATE_RECORD_EVT, &bta_jv, rfcomm_slot_id);

  }

}

system/bta/jv/bta_jv_api.cc

+1 −8
Original line number Diff line number Diff line
@@ -219,16 +219,9 @@ tBTA_JV_STATUS BTA_JvStartDiscovery(const RawAddress& bd_addr, 
 *

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

tBTA_JV_STATUS BTA_JvCreateRecordByUser(uint32_t rfcomm_slot_id) {

  tBTA_JV_API_CREATE_RECORD* p_msg =

      (tBTA_JV_API_CREATE_RECORD*)osi_malloc(sizeof(tBTA_JV_API_CREATE_RECORD));



  APPL_TRACE_API("%s", __func__);



  p_msg->hdr.event = BTA_JV_API_CREATE_RECORD_EVT;

  p_msg->rfcomm_slot_id = rfcomm_slot_id;



  bta_sys_sendmsg(p_msg);



  do_in_bta_thread(FROM_HERE, Bind(&bta_jv_create_record, rfcomm_slot_id));

  return BTA_JV_SUCCESS;

}

system/bta/jv/bta_jv_int.h

+1 −9
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
enum {

  /* these events are handled by the state machine */

  BTA_JV_API_START_DISCOVERY_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_CREATE_RECORD_EVT,

  BTA_JV_API_DELETE_RECORD_EVT,

  BTA_JV_API_L2CAP_CONNECT_EVT,

  BTA_JV_API_L2CAP_CLOSE_EVT,
@@ -280,12 +279,6 @@ typedef struct { 
  uint32_t rfcomm_slot_id;

} tBTA_JV_API_RFCOMM_CLOSE;



/* data type for BTA_JV_API_CREATE_RECORD_EVT */

typedef struct {

  BT_HDR hdr;

  uint32_t rfcomm_slot_id;

} tBTA_JV_API_CREATE_RECORD;



/* data type for BTA_JV_API_ADD_ATTRIBUTE_EVT */

typedef struct {

  BT_HDR hdr;
@@ -300,7 +293,6 @@ typedef union { 
  /* GKI event buffer header */

  BT_HDR hdr;

  tBTA_JV_API_START_DISCOVERY start_discovery;

  tBTA_JV_API_CREATE_RECORD create_record;

  tBTA_JV_API_ADD_ATTRIBUTE add_attr;

  tBTA_JV_API_L2CAP_CONNECT l2cap_connect;

  tBTA_JV_API_L2CAP_READ l2cap_read;
@@ -358,7 +350,7 @@ extern void bta_jv_get_channel_id(int32_t type, int32_t channel, 
                                  uint32_t rfcomm_slot_id);

extern void bta_jv_free_scn(int32_t type, uint16_t scn);

extern void bta_jv_start_discovery(tBTA_JV_MSG* p_data);

extern void bta_jv_create_record(tBTA_JV_MSG* p_data);

extern void bta_jv_create_record(uint32_t rfcomm_slot_id);

extern void bta_jv_delete_record(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_connect(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_close(tBTA_JV_MSG* p_data);

system/bta/jv/bta_jv_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ typedef void (*tBTA_JV_ACTION)(tBTA_JV_MSG* p_data); 
/* action function list */

const tBTA_JV_ACTION bta_jv_action[] = {

    bta_jv_start_discovery,       /* BTA_JV_API_START_DISCOVERY_EVT */

    bta_jv_create_record,         /* BTA_JV_API_CREATE_RECORD_EVT */

    bta_jv_delete_record,         /* BTA_JV_API_DELETE_RECORD_EVT */

    bta_jv_l2cap_connect,         /* BTA_JV_API_L2CAP_CONNECT_EVT */

    bta_jv_l2cap_close,           /* BTA_JV_API_L2CAP_CLOSE_EVT */