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

Commit 21b1a3b8 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Remove BTA_DM_SP_KEYPRESS_EVT, it's not used am: bc585280 am: 00392aa4 

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

Change-Id: I89aed53c9dc53862686d50e3645b6e912dd598b7
parents 0d7c77bc 00392aa4

system/bta/dm/bta_dm_act.cc

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



    case BTM_SP_KEYPRESS_EVT:

      memcpy(&sec_event.key_press, &p_data->key_press,

             sizeof(tBTM_SP_KEYPRESS));

      bta_dm_cb.p_sec_cback(BTA_DM_SP_KEYPRESS_EVT, &sec_event);

      break;



    default:

system/bta/include/bta_api.h

+0 −8
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_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 */

#define BTA_DM_BLE_PASSKEY_NOTIF_EVT 17 /* SMP passkey notification event */
@@ -600,12 +599,6 @@ enum { 
};

typedef uint8_t tBTA_SP_KEY_TYPE;



/* Structure associated with BTA_DM_SP_KEYPRESS_EVT */

typedef struct {

  RawAddress bd_addr; /* peer address */

  tBTA_SP_KEY_TYPE notif_type;

} tBTA_DM_SP_KEY_PRESS;



/* Structure associated with BTA_DM_SP_KEY_NOTIF_EVT */

typedef struct {

  /* Note: First 3 data members must be, bd_addr, dev_class, and bd_name in
@@ -643,7 +636,6 @@ typedef union { 
  tBTA_DM_SP_RMT_OOB rmt_oob;     /* remote oob */

  tBTA_DM_BOND_CANCEL_CMPL

      bond_cancel_cmpl;               /* Bond Cancel Complete indication */

  tBTA_DM_SP_KEY_PRESS key_press;     /* key press notification event */

  tBTA_DM_BLE_SEC_REQ ble_req;        /* BLE SMP related request */

  tBTA_DM_BLE_KEY ble_key;            /* BLE SMP keys used when pairing */

  tBTA_BLE_LOCAL_ID_KEYS ble_id_keys; /* IR event */

system/btif/src/btif_dm.cc

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

    }



    case BTA_DM_SP_KEYPRESS_EVT:

    default:

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

      break;

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_KEYPRESS_EVT)

    CASE_RETURN_STR(BTA_DM_BLE_KEY_EVT)

    CASE_RETURN_STR(BTA_DM_BLE_SEC_REQ_EVT)

    CASE_RETURN_STR(BTA_DM_BLE_PASSKEY_NOTIF_EVT)