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

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

Remove BTA_DM_AUTHORIZE_EVT, it's not used am: 9bf41e7f am: bd9a11b8 am: 39a3b7c3 

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

Change-Id: Ie3d56080bfcb72cb4954affe9a0ba18438a09bc9
parents 357d4af8 39a3b7c3

system/bta/dm/bta_dm_act.cc

+0 −12
Original line number Diff line number Diff line
@@ -2221,21 +2221,10 @@ static uint8_t bta_dm_authorize_cback(const RawAddress& bd_addr, 
                                      UNUSED_ATTR uint8_t* service_name,

                                      uint8_t service_id,

                                      UNUSED_ATTR bool is_originator) {

  tBTA_DM_SEC sec_event;

  uint8_t index = 1;



  sec_event.authorize.bd_addr = bd_addr;

  memcpy(sec_event.authorize.dev_class, dev_class, DEV_CLASS_LEN);

  strlcpy((char*)sec_event.authorize.bd_name, (char*)bd_name, BD_NAME_LEN);



#if (BTA_JV_INCLUDED == TRUE)

  sec_event.authorize.service = service_id;

#endif



  while (index < BTA_MAX_SERVICE_ID) {

    /* get the BTA service id corresponding to BTM id */

    if (bta_service_id_to_btm_srv_id_lkup_tbl[index] == service_id) {

      sec_event.authorize.service = index;

      break;

    }

    index++;
@@ -2249,7 +2238,6 @@ static uint8_t bta_dm_authorize_cback(const RawAddress& bd_addr, 
                                    service_id <= BTA_LAST_JV_SERVICE_ID)

#endif

                                    )) {

    bta_dm_cb.p_sec_cback(BTA_DM_AUTHORIZE_EVT, &sec_event);

    return BTM_CMD_STARTED;

  } else {

    return BTM_NOT_AUTHORIZED;

system/bta/include/bta_api.h

+0 −9
Original line number Diff line number Diff line
@@ -510,14 +510,6 @@ typedef struct { 
  tBT_DEVICE_TYPE dev_type;

} tBTA_DM_AUTH_CMPL;



/* Structure associated with BTA_DM_AUTHORIZE_EVT */

typedef struct {

  RawAddress bd_addr;      /* BD address peer device. */

  BD_NAME bd_name;         /* Name of peer device. */

  tBTA_SERVICE_ID service; /* Service ID to authorize. */

  DEV_CLASS dev_class;

} tBTA_DM_AUTHORIZE;



/* Structure associated with BTA_DM_LINK_UP_EVT */

typedef struct {

  RawAddress bd_addr; /* BD address peer device. */
@@ -648,7 +640,6 @@ typedef union { 
  tBTA_DM_ENABLE enable;          /* BTA enabled */

  tBTA_DM_PIN_REQ pin_req;        /* PIN request. */

  tBTA_DM_AUTH_CMPL auth_cmpl;    /* Authentication complete indication. */

  tBTA_DM_AUTHORIZE authorize;    /* Authorization request. */

  tBTA_DM_LINK_UP link_up;        /* ACL connection down event */

  tBTA_DM_LINK_DOWN link_down;    /* ACL connection down event */

  tBTA_DM_SP_CFM_REQ cfm_req;     /* user confirm request */

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_AUTHORIZE_EVT:

    case BTA_DM_SIG_STRENGTH_EVT:

    case BTA_DM_SP_RMT_OOB_EVT:

    case BTA_DM_SP_KEYPRESS_EVT:

system/btif/src/btif_util.cc

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

    CASE_RETURN_STR(BTA_DM_PIN_REQ_EVT)

    CASE_RETURN_STR(BTA_DM_AUTH_CMPL_EVT)

    CASE_RETURN_STR(BTA_DM_AUTHORIZE_EVT)

    CASE_RETURN_STR(BTA_DM_LINK_UP_EVT)

    CASE_RETURN_STR(BTA_DM_LINK_DOWN_EVT)

    CASE_RETURN_STR(BTA_DM_SIG_STRENGTH_EVT)