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

Commit 225b0dc9 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use Bind in BTA_JvDisable 

Bug: 68359837
Test: compilation test
Change-Id: I73470c7a98a36a57d5f44decbbf388f02c6caddd
parent 869a7e94

system/bta/jv/bta_jv_act.cc

+2 −13
Original line number Diff line number Diff line
@@ -619,19 +619,8 @@ void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback) { 
  memset(bta_jv_cb.free_psm_list, 0, sizeof(bta_jv_cb.free_psm_list));

}



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

 *

 * Function     bta_jv_disable

 *

 * Description  Disables the BT device manager

 *              free the resources used by java

 *

 * Returns      void

 *

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

void bta_jv_disable(UNUSED_ATTR tBTA_JV_MSG* p_data) {

  APPL_TRACE_ERROR("%s", __func__);

}

/** Disables the BT device manager free the resources used by java */

void bta_jv_disable() { APPL_TRACE_ERROR("%s", __func__); }



/**

 * We keep a list of PSM's that have been freed from JAVA, for reuse.

system/bta/jv/bta_jv_api.cc

+2 −13
Original line number Diff line number Diff line
@@ -84,24 +84,13 @@ tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK* p_cback) { 
  return (status);

}



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

 *

 * Function         BTA_JvDisable

 *

 * Description      Disable the Java I/F

 *

 * Returns          void

 *

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

/** Disable the Java I/F */

void BTA_JvDisable(void) {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));



  APPL_TRACE_API("%s", __func__);



  bta_sys_deregister(BTA_ID_JV);

  p_buf->event = BTA_JV_API_DISABLE_EVT;



  bta_sys_sendmsg(p_buf);

  do_in_bta_thread(FROM_HERE, Bind(&bta_jv_disable));

}



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

system/bta/jv/bta_jv_int.h

+2 −3
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ 


enum {

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

  BTA_JV_API_DISABLE_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_GET_CHANNEL_EVT,

  BTA_JV_API_GET_CHANNEL_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_FREE_SCN_EVT,

  BTA_JV_API_START_DISCOVERY_EVT,

  BTA_JV_API_CREATE_RECORD_EVT,
@@ -372,7 +371,7 @@ extern tBTA_JV_CFG* p_bta_jv_cfg; 
extern bool bta_jv_sm_execute(BT_HDR* p_msg);



extern void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback);

extern void bta_jv_disable(tBTA_JV_MSG* p_data);

extern void bta_jv_disable();

extern void bta_jv_get_channel_id(tBTA_JV_MSG* p_data);

extern void bta_jv_free_scn(tBTA_JV_MSG* p_data);

extern void bta_jv_start_discovery(tBTA_JV_MSG* p_data);

system/bta/jv/bta_jv_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ typedef void (*tBTA_JV_ACTION)(tBTA_JV_MSG* p_data); 


/* action function list */

const tBTA_JV_ACTION bta_jv_action[] = {

    bta_jv_disable,               /* BTA_JV_API_DISABLE_EVT */

    bta_jv_get_channel_id,        /* BTA_JV_API_GET_CHANNEL_EVT */

    bta_jv_free_scn,              /* BTA_JV_API_FREE_SCN_EVT */

    bta_jv_start_discovery,       /* BTA_JV_API_START_DISCOVERY_EVT */