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

Commit 37f36ce9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7090785 from f2eee2e2 to sc-release 

Change-Id: I110b6fea944611d087119da012a050a0085cb24d
parents 17cd6b4a f2eee2e2

system/stack/acl/btm_acl.cc

+0 −8
Original line number Diff line number Diff line
@@ -2603,14 +2603,6 @@ uint8_t acl_link_role_from_handle(uint16_t handle) { 
  return p_acl->link_role;

}



bool acl_is_transport_le_from_handle(uint16_t handle) {

  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(handle);

  if (p_acl == nullptr) {

    return false;

  }

  return p_acl->transport == BT_TRANSPORT_LE;

}



tBT_TRANSPORT acl_get_transport_from_handle(uint16_t handle) {

  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(handle);

  if (p_acl == nullptr) {

system/stack/btm/btm_sec.cc

+4 −7
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, 
  if (transport == BT_TRANSPORT_LE) {

    if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE)) {

      rc = btm_ble_set_encryption(bd_addr, sec_act,

                                  acl_link_role(bd_addr, transport));

                                  L2CA_GetBleConnRole(bd_addr));

    } else {

      rc = BTM_WRONG_MODE;

      BTM_TRACE_WARNING("%s: cannot call btm_ble_set_encryption, p is NULL",
@@ -3204,13 +3204,10 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
  BTM_TRACE_DEBUG("after update p_dev_rec->sec_flags=0x%x",

                  p_dev_rec->sec_flags);



  if (BTM_IsAclConnectionUpFromHandle(handle)) {

  btm_sec_check_pending_enc_req(

      p_dev_rec, acl_get_transport_from_handle(handle), encr_enable);

  }



  if (BTM_IsAclConnectionUpFromHandle(handle) &&

      acl_is_transport_le_from_handle(handle)) {

  if (BTM_IsBleConnection(handle)) {

    if (status == HCI_ERR_KEY_MISSING || status == HCI_ERR_AUTH_FAILURE ||

        status == HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE) {

      p_dev_rec->sec_flags &= ~(BTM_SEC_LE_LINK_KEY_KNOWN);

system/stack/include/acl_api.h

+0 −2
Original line number Diff line number Diff line
@@ -283,8 +283,6 @@ void btm_cont_rswitch_from_handle(uint16_t hci_handle); 
uint8_t acl_link_role(const RawAddress& remote_bda, tBT_TRANSPORT transport);

uint8_t acl_link_role_from_handle(uint16_t handle);



bool acl_is_transport_le_from_handle(uint16_t handle);



tBT_TRANSPORT acl_get_transport_from_handle(uint16_t handle);



uint16_t acl_get_hci_handle_for_hcif(const RawAddress& bd_addr,

system/stack/l2cap/l2c_api.cc

+1 −3
Original line number Diff line number Diff line
@@ -1144,8 +1144,6 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  if (bluetooth::shim::is_gd_l2cap_enabled()) {

    return bluetooth::shim::L2CA_ConnectFixedChnl(fixed_cid, rem_bda);

  }

  uint8_t initiating_phys =

      controller_get_interface()->get_le_all_initiating_phys();



  tL2C_LCB* p_lcb;

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
@@ -1230,7 +1228,7 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  }



  if (transport == BT_TRANSPORT_LE) {

    bool ret = l2cu_create_conn_le(p_lcb, initiating_phys);

    bool ret = l2cu_create_conn_le(p_lcb);

    if (!ret) {

      LOG_WARN("Unable to create fixed channel le connection fixed_cid:0x%04x",

               fixed_cid);

system/stack/l2cap/l2c_int.h

+0 −1
Original line number Diff line number Diff line
@@ -721,7 +721,6 @@ extern bool l2cu_lcb_disconnecting(void); 


extern void l2cu_create_conn_br_edr(tL2C_LCB* p_lcb);

extern bool l2cu_create_conn_le(tL2C_LCB* p_lcb);

extern bool l2cu_create_conn_le(tL2C_LCB* p_lcb, uint8_t initiating_phys);

extern void l2cu_create_conn_after_switch(tL2C_LCB* p_lcb);

extern void l2cu_adjust_out_mps(tL2C_CCB* p_ccb);