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

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

Use Bind in BTA_JvDeleteRecord 

Bug: 68359837
Test: compilation test
Change-Id: I23236fecf21ffb7808cfabef1570add2e07b0920
parent c3cc8935

system/bta/jv/bta_jv_act.cc

+4 −14
Original line number Diff line number Diff line
@@ -854,21 +854,11 @@ void bta_jv_create_record(uint32_t rfcomm_slot_id) { 
  }

}



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

 *

 * Function     bta_jv_delete_record

 *

 * Description  Delete an SDP record

 *

 *

 * Returns      void

 *

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

void bta_jv_delete_record(tBTA_JV_MSG* p_data) {

  tBTA_JV_API_ADD_ATTRIBUTE* dr = &(p_data->add_attr);

  if (dr->handle) {

/* Delete an SDP record */

void bta_jv_delete_record(uint32_t handle) {

  if (handle) {

    /* this is a record created by btif layer*/

    SDP_DeleteRecord(dr->handle);

    SDP_DeleteRecord(handle);

  }

}

system/bta/jv/bta_jv_api.cc

+1 −8
Original line number Diff line number Diff line
@@ -236,16 +236,9 @@ tBTA_JV_STATUS BTA_JvCreateRecordByUser(uint32_t rfcomm_slot_id) { 
 *

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

tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle) {

  tBTA_JV_API_ADD_ATTRIBUTE* p_msg =

      (tBTA_JV_API_ADD_ATTRIBUTE*)osi_malloc(sizeof(tBTA_JV_API_ADD_ATTRIBUTE));



  APPL_TRACE_API("%s", __func__);



  p_msg->hdr.event = BTA_JV_API_DELETE_RECORD_EVT;

  p_msg->handle = handle;



  bta_sys_sendmsg(p_msg);



  do_in_bta_thread(FROM_HERE, Bind(&bta_jv_delete_record, handle));

  return BTA_JV_SUCCESS;

}

system/bta/jv/bta_jv_int.h

+1 −12
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_DELETE_RECORD_EVT,

  BTA_JV_API_L2CAP_CONNECT_EVT,

  BTA_JV_API_L2CAP_CLOSE_EVT,

  BTA_JV_API_L2CAP_START_SERVER_EVT,
@@ -279,21 +278,11 @@ typedef struct { 
  uint32_t rfcomm_slot_id;

} tBTA_JV_API_RFCOMM_CLOSE;



/* data type for BTA_JV_API_ADD_ATTRIBUTE_EVT */

typedef struct {

  BT_HDR hdr;

  uint32_t handle;

  uint16_t attr_id;

  uint8_t* p_value;

  int32_t value_size;

} tBTA_JV_API_ADD_ATTRIBUTE;



/* union of all data types */

typedef union {

  /* GKI event buffer header */

  BT_HDR hdr;

  tBTA_JV_API_START_DISCOVERY start_discovery;

  tBTA_JV_API_ADD_ATTRIBUTE add_attr;

  tBTA_JV_API_L2CAP_CONNECT l2cap_connect;

  tBTA_JV_API_L2CAP_READ l2cap_read;

  tBTA_JV_API_L2CAP_WRITE l2cap_write;
@@ -351,7 +340,7 @@ extern void bta_jv_get_channel_id(int32_t type, int32_t channel, 
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(uint32_t rfcomm_slot_id);

extern void bta_jv_delete_record(tBTA_JV_MSG* p_data);

extern void bta_jv_delete_record(uint32_t handle);

extern void bta_jv_l2cap_connect(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_close(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_start_server(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_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 */

    bta_jv_l2cap_start_server,    /* BTA_JV_API_L2CAP_START_SERVER_EVT */