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

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

stop reporting role change to btif am: b43f5677 am: 53fe669a am: 5bd3cc92 

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

Change-Id: I78ea0f695107dd1123bdff6cd0c29b7a0c21bbfd
parents 35d6dbe5 5bd3cc92

system/bta/dm/bta_dm_act.cc

+0 −6
Original line number Diff line number Diff line
@@ -2643,9 +2643,6 @@ static void bta_dm_local_name_cback(UNUSED_ATTR void* p_name) { 


static void handle_role_change(const RawAddress& bd_addr, uint8_t new_role,

                               uint8_t hci_status) {

  tBTA_DM_SEC conn;

  memset(&conn, 0, sizeof(tBTA_DM_SEC));



  tBTA_DM_PEER_DEVICE* p_dev = bta_dm_find_peer_device(bd_addr);

  if (!p_dev) return;

  LOG_INFO("%s: peer %s info:0x%x new_role:0x%x dev count:%d hci_status=%d",
@@ -2679,9 +2676,6 @@ static void handle_role_change(const RawAddress& bd_addr, uint8_t new_role, 
    bta_dm_check_av(0);

  }

  bta_sys_notify_role_chg(bd_addr, new_role, hci_status);

  conn.role_chg.bd_addr = bd_addr;

  conn.role_chg.new_role = (uint8_t)new_role;

  if (bta_dm_cb.p_sec_cback) bta_dm_cb.p_sec_cback(BTA_DM_ROLE_CHG_EVT, &conn);

}



static tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr,

system/bta/include/bta_api.h

+0 −8
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ typedef uint8_t tBTA_SIG_STRENGTH_MASK; 
#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_ROLE_CHG_EVT 14     /* Role Change 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 */
@@ -529,12 +528,6 @@ typedef struct { 
  RawAddress bd_addr; /* BD address peer device. */

} tBTA_DM_LINK_DOWN;



/* Structure associated with BTA_DM_ROLE_CHG_EVT */

typedef struct {

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

  uint8_t new_role; /* the new connection role */

} tBTA_DM_ROLE_CHG;



#define BTA_IO_CAP_OUT BTM_IO_CAP_OUT       /* 0 DisplayOnly */

#define BTA_IO_CAP_IO BTM_IO_CAP_IO         /* 1 DisplayYesNo */

#define BTA_IO_CAP_IN BTM_IO_CAP_IN         /* 2 KeyboardOnly */
@@ -664,7 +657,6 @@ typedef union { 
  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_ROLE_CHG role_chg;          /* role change 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 −2
Original line number Diff line number Diff line
@@ -1991,8 +1991,6 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
    case BTA_DM_SIG_STRENGTH_EVT:

    case BTA_DM_SP_RMT_OOB_EVT:

    case BTA_DM_SP_KEYPRESS_EVT:

    case BTA_DM_ROLE_CHG_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
@@ -157,7 +157,6 @@ const char* dump_dm_event(uint16_t event) { 
    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_ROLE_CHG_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)