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

Commit 503d90eb authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Remove BTA_DM_SP_RMT_OOB_EVT, it's not used am: 565ddbfa 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393952

Change-Id: I4314cf2960d60747d0a70fd8ea464820d3258516
parents 325ad136 565ddbfa

system/bta/dm/bta_dm_act.cc

+0 −23
Original line number Diff line number Diff line
@@ -2556,29 +2556,6 @@ static uint8_t bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) { 
      break;



    case BTM_SP_RMT_OOB_EVT:

      /* If the device name is not known, save bdaddr and devclass and initiate

       * a name request */

      if (p_data->rmt_oob.bd_name[0] == 0) {

        bta_dm_cb.pin_evt = BTA_DM_SP_RMT_OOB_EVT;

        bta_dm_cb.pin_bd_addr = p_data->rmt_oob.bd_addr;

        BTA_COPY_DEVICE_CLASS(bta_dm_cb.pin_dev_class,

                              p_data->rmt_oob.dev_class);

        if ((BTM_ReadRemoteDeviceName(p_data->rmt_oob.bd_addr,

                                      bta_dm_pinname_cback,

                                      BT_TRANSPORT_BR_EDR)) == BTM_CMD_STARTED)

          return BTM_CMD_STARTED;

        APPL_TRACE_WARNING(

            " bta_dm_sp_cback() -> Failed to start Remote Name Request  ");

      }



      sec_event.rmt_oob.bd_addr = p_data->rmt_oob.bd_addr;

      BTA_COPY_DEVICE_CLASS(sec_event.rmt_oob.dev_class,

                            p_data->rmt_oob.dev_class);

      strlcpy((char*)sec_event.rmt_oob.bd_name, (char*)p_data->rmt_oob.bd_name,

              BD_NAME_LEN);



      bta_dm_cb.p_sec_cback(BTA_DM_SP_RMT_OOB_EVT, &sec_event);



      bta_dm_co_rmt_oob(p_data->rmt_oob.bd_addr);

      break;

system/bta/include/bta_api.h

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ typedef uint8_t tBTA_SIG_STRENGTH_MASK; 
  10 /* Simple Pairing User Confirmation request. \

        */

#define BTA_DM_SP_KEY_NOTIF_EVT 11 /* Simple Pairing Passkey Notification */

#define BTA_DM_SP_RMT_OOB_EVT 12   /* Simple Pairing Remote OOB Data request. */

#define BTA_DM_SP_KEYPRESS_EVT 13  /* Key press notification event. */

#define BTA_DM_BLE_KEY_EVT 15      /* BLE SMP key event for peer device keys */

#define BTA_DM_BLE_SEC_REQ_EVT 16  /* BLE SMP security request */

system/btif/src/btif_dm.cc

+0 −1
Original line number Diff line number Diff line
@@ -1983,7 +1983,6 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
      break;

    }



    case BTA_DM_SP_RMT_OOB_EVT:

    case BTA_DM_SP_KEYPRESS_EVT:

    default:

      BTIF_TRACE_WARNING("%s: unhandled event (%d)", __func__, event);

system/btif/src/btif_util.cc

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ const char* dump_dm_event(uint16_t event) { 
    CASE_RETURN_STR(BTA_DM_BOND_CANCEL_CMPL_EVT)

    CASE_RETURN_STR(BTA_DM_SP_CFM_REQ_EVT)

    CASE_RETURN_STR(BTA_DM_SP_KEY_NOTIF_EVT)

    CASE_RETURN_STR(BTA_DM_SP_RMT_OOB_EVT)

    CASE_RETURN_STR(BTA_DM_SP_KEYPRESS_EVT)

    CASE_RETURN_STR(BTA_DM_BLE_KEY_EVT)

    CASE_RETURN_STR(BTA_DM_BLE_SEC_REQ_EVT)