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

Commit 8bfe6fd5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove BTIF_DM_CB_HID_REMOTE_NAME, it's never used 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib63dc45a46136205de56b6079fa46175a924ac55
parent 68f40697

system/btif/include/btif_common.h

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ enum { 
  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

+0 −28
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ 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,

                                   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 +686,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
@@ -2016,10 +1992,6 @@ static void btif_dm_generic_evt(uint16_t event, char* p_param) { 
      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);