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

Commit 58457e3d authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes Ic219f578,Ib63dc45a 

* changes:
  Remove BTIF_DM_CB_CREATE_BOND
  Remove BTIF_DM_CB_HID_REMOTE_NAME, it's never used
parents 3db03437 275f7b1a

system/btif/include/btif_common.h

+0 −2
Original line number Diff line number Diff line
@@ -127,9 +127,7 @@ enum { 
  /* add here */



  BTIF_DM_CB_START = BTIF_SIG_CB_START(BTIF_DM),

  BTIF_DM_CB_CREATE_BOND,       /* Create bond */

  BTIF_DM_CB_REMOVE_BOND,       /*Remove bond */

  BTIF_DM_CB_HID_REMOTE_NAME,   /* Remote name callback for HID device */

  BTIF_DM_CB_BOND_STATE_BONDING,

  BTIF_DM_CB_LE_TX_TEST,  /* BLE Tx Test command complete callback */

  BTIF_DM_CB_LE_RX_TEST,  /* BLE Rx Test command complete callback */

system/btif/src/btif_dm.cc

+5 −50
Original line number Diff line number Diff line
@@ -158,11 +158,6 @@ typedef struct { 
  bt_out_of_band_data_t oob_data;

} btif_dm_oob_cb_t;



typedef struct {

  RawAddress bdaddr;

  uint8_t transport; /* 0=Unknown, 1=BR/EDR, 2=LE */

} btif_dm_create_bond_cb_t;



typedef struct {

  uint8_t status;

  uint8_t ctrl_state;
@@ -220,9 +215,8 @@ static size_t btif_events_end_index = 0; 
static btif_dm_pairing_cb_t pairing_cb;

static btif_dm_oob_cb_t oob_cb;

static void btif_dm_generic_evt(uint16_t event, char* p_param);

static void btif_dm_cb_create_bond(const RawAddress& bd_addr,

static void btif_dm_cb_create_bond(const RawAddress bd_addr,

                                   tBTA_TRANSPORT transport);

static void btif_dm_cb_hid_remote_name(tBTM_REMOTE_DEV_NAME* p_remote_name);

static void btif_update_remote_properties(const RawAddress& bd_addr,

                                          BD_NAME bd_name, DEV_CLASS dev_class,

                                          tBT_DEVICE_TYPE dev_type);
@@ -687,29 +681,6 @@ static void btif_update_remote_properties(const RawAddress& bdaddr, 
            num_properties, properties);

}



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

 *

 * Function         btif_dm_cb_hid_remote_name

 *

 * Description      Remote name callback for HID device. Called in btif context

 *                  Special handling for HID devices

 *

 * Returns          void

 *

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

static void btif_dm_cb_hid_remote_name(tBTM_REMOTE_DEV_NAME* p_remote_name) {

  BTIF_TRACE_DEBUG("%s: status=%d pairing_cb.state=%d", __func__,

                   p_remote_name->status, pairing_cb.state);

  if (pairing_cb.state == BT_BOND_STATE_BONDING) {

    if (p_remote_name->status == BTM_SUCCESS) {

      bond_state_changed(BT_STATUS_SUCCESS, pairing_cb.bd_addr,

                         BT_BOND_STATE_BONDED);

    } else

      bond_state_changed(BT_STATUS_FAIL, pairing_cb.bd_addr,

                         BT_BOND_STATE_NONE);

  }

}



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

 *

 * Function         btif_dm_cb_create_bond
@@ -720,7 +691,7 @@ static void btif_dm_cb_hid_remote_name(tBTM_REMOTE_DEV_NAME* p_remote_name) { 
 * Returns          void

 *

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

static void btif_dm_cb_create_bond(const RawAddress& bd_addr,

static void btif_dm_cb_create_bond(const RawAddress bd_addr,

                                   tBTA_TRANSPORT transport) {

  bool is_hid = check_cod(&bd_addr, COD_HID_POINTING);

  bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
@@ -2005,21 +1976,10 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
static void btif_dm_generic_evt(uint16_t event, char* p_param) {

  BTIF_TRACE_EVENT("%s: event=%d", __func__, event);

  switch (event) {

    case BTIF_DM_CB_CREATE_BOND: {

      pairing_cb.timeout_retries = NUM_TIMEOUT_RETRIES;

      btif_dm_create_bond_cb_t* create_bond_cb =

          (btif_dm_create_bond_cb_t*)p_param;

      btif_dm_cb_create_bond(create_bond_cb->bdaddr, create_bond_cb->transport);

    } break;



    case BTIF_DM_CB_REMOVE_BOND: {

      btif_dm_cb_remove_bond((RawAddress*)p_param);

    } break;



    case BTIF_DM_CB_HID_REMOTE_NAME: {

      btif_dm_cb_hid_remote_name((tBTM_REMOTE_DEV_NAME*)p_param);

    } break;



    case BTIF_DM_CB_BOND_STATE_BONDING: {

      bond_state_changed(BT_STATUS_SUCCESS, *((RawAddress*)p_param),

                         BT_BOND_STATE_BONDING);
@@ -2284,10 +2244,6 @@ bt_status_t btif_dm_cancel_discovery(void) { 
 *

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

bt_status_t btif_dm_create_bond(const RawAddress* bd_addr, int transport) {

  btif_dm_create_bond_cb_t create_bond_cb;

  create_bond_cb.transport = transport;

  create_bond_cb.bdaddr = *bd_addr;



  BTIF_TRACE_EVENT("%s: bd_addr=%s, transport=%d", __func__,

                   bd_addr->ToString().c_str(), transport);

  if (pairing_cb.state != BT_BOND_STATE_NONE) return BT_STATUS_BUSY;
@@ -2295,10 +2251,9 @@ bt_status_t btif_dm_create_bond(const RawAddress* bd_addr, int transport) { 
  btif_stats_add_bond_event(*bd_addr, BTIF_DM_FUNC_CREATE_BOND,

                            pairing_cb.state);



  btif_transfer_context(btif_dm_generic_evt, BTIF_DM_CB_CREATE_BOND,

                        (char*)&create_bond_cb,

                        sizeof(btif_dm_create_bond_cb_t), NULL);



  pairing_cb.timeout_retries = NUM_TIMEOUT_RETRIES;

  do_in_jni_thread(FROM_HERE,

                   base::BindOnce(btif_dm_cb_create_bond, *bd_addr, transport));

  return BT_STATUS_SUCCESS;

}