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

Commit a87e41eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I4b15d054,Id53d86f3,Icc604d09,Ib19ee20d,I550d96d1, ... am: 0e85edc9 

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

Change-Id: I57b3e63ea7dbd90fd9e457e391c2a6425ff439a1
parents f79c40a3 0e85edc9

system/main/shim/btm_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ void bluetooth::shim::SendRemoteNameRequest(const RawAddress& raw_address) { 


tBTM_STATUS bluetooth::shim::btm_sec_mx_access_request(

    const RawAddress& bd_addr, uint16_t psm, bool is_originator,

    uint32_t mx_proto_id, uint32_t mx_chan_id, tBTM_SEC_CBACK* p_callback,

    uint32_t mx_proto_id, uint32_t mx_chan_id, tBTM_SEC_CALLBACK* p_callback,

    void* p_ref_data) {

  // Security has already been fulfilled by the l2cap connection, so reply back

  // that everything is totally fine and legit and definitely not two kids in a
@@ -985,7 +985,7 @@ tBTM_STATUS bluetooth::shim::btm_sec_mx_access_request( 


tBTM_STATUS bluetooth::shim::BTM_SetEncryption(const RawAddress& bd_addr,

                                               tBT_TRANSPORT transport,

                                               tBTM_SEC_CBACK* p_callback,

                                               tBTM_SEC_CALLBACK* p_callback,

                                               void* p_ref_data,

                                               tBTM_BLE_SEC_ACT sec_act) {

  // When we just bond a device, encryption is already done

system/main/shim/btm_api.h

+2 −2
Original line number Diff line number Diff line
@@ -1622,7 +1622,7 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr); 
 ******************************************************************************/

tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr,

                              tBT_TRANSPORT transport,

                              tBTM_SEC_CBACK* p_callback, void* p_ref_data,

                              tBTM_SEC_CALLBACK* p_callback, void* p_ref_data,

                              tBTM_BLE_SEC_ACT sec_act);



/*******************************************************************************
@@ -2002,7 +2002,7 @@ void SendRemoteNameRequest(const RawAddress& raw_address); 
tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, uint16_t psm,

                                      bool is_originator, uint32_t mx_proto_id,

                                      uint32_t mx_chan_id,

                                      tBTM_SEC_CBACK* p_callback,

                                      tBTM_SEC_CALLBACK* p_callback,

                                      void* p_ref_data);



}  // namespace shim

system/stack/acl/acl.h

+2 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ typedef struct { 
typedef struct {

  BD_FEATURES peer_le_features;

  BD_FEATURES peer_lmp_feature_pages[HCI_EXT_FEATURES_PAGE_MAX + 1];

  BD_NAME remote_name;

  DEV_CLASS remote_dc;

  RawAddress active_remote_addr;

  RawAddress conn_addr;

  RawAddress remote_addr;
@@ -114,9 +112,8 @@ typedef struct { 
  friend void BTM_default_block_role_switch();

  friend void BTM_default_unblock_role_switch();

  friend void acl_set_disconnect_reason(uint8_t acl_disc_reason);

  friend void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,

                              uint16_t hci_handle, uint8_t link_role,

                              tBT_TRANSPORT transport);

  friend void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,

                              uint8_t link_role, tBT_TRANSPORT transport);

  friend void btm_acl_device_down(void);

  friend void btm_acl_encrypt_change(uint16_t handle, uint8_t status,

                                     uint8_t encr_enable);

system/stack/acl/btm_acl.cc

+49 −42
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "common/metrics.h"

#include "device/include/controller.h"

#include "device/include/interop.h"

#include "include/l2cap_hci_link_interface.h"

#include "main/shim/btm_api.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"
@@ -48,10 +49,11 @@ 
#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/btm_api.h"

#include "stack/include/btu.h"

#include "stack/include/hcimsgs.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "stack/include/l2cap_acl_interface.h"

#include "types/raw_address.h"



struct StackAclBtmAcl {
@@ -117,9 +119,8 @@ void btm_acl_init(void) { 
  btm_cb.acl_cb_.acl_disc_reason = 0xff;



  btm_cb.acl_cb_.btm_acl_pkt_types_supported =

      BTM_ACL_PKT_TYPES_MASK_DH1 + BTM_ACL_PKT_TYPES_MASK_DM1 +

      BTM_ACL_PKT_TYPES_MASK_DH3 + BTM_ACL_PKT_TYPES_MASK_DM3 +

      BTM_ACL_PKT_TYPES_MASK_DH5 + BTM_ACL_PKT_TYPES_MASK_DM5;

      HCI_PKT_TYPES_MASK_DH1 + HCI_PKT_TYPES_MASK_DM1 + HCI_PKT_TYPES_MASK_DH3 +

      HCI_PKT_TYPES_MASK_DM3 + HCI_PKT_TYPES_MASK_DH5 + HCI_PKT_TYPES_MASK_DM5;

}



void BTM_acl_after_controller_started() {
@@ -131,27 +132,27 @@ void BTM_acl_after_controller_started() { 


  /* Create ACL supported packet types mask */

  btm_cb.acl_cb_.btm_acl_pkt_types_supported =

      (BTM_ACL_PKT_TYPES_MASK_DH1 + BTM_ACL_PKT_TYPES_MASK_DM1);

      (HCI_PKT_TYPES_MASK_DH1 + HCI_PKT_TYPES_MASK_DM1);



  if (controller->supports_3_slot_packets())

    btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

        (BTM_ACL_PKT_TYPES_MASK_DH3 + BTM_ACL_PKT_TYPES_MASK_DM3);

        (HCI_PKT_TYPES_MASK_DH3 + HCI_PKT_TYPES_MASK_DM3);



  if (controller->supports_5_slot_packets())

    btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

        (BTM_ACL_PKT_TYPES_MASK_DH5 + BTM_ACL_PKT_TYPES_MASK_DM5);

        (HCI_PKT_TYPES_MASK_DH5 + HCI_PKT_TYPES_MASK_DM5);



  /* Add in EDR related ACL types */

  if (!controller->supports_classic_2m_phy()) {

    btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

        (BTM_ACL_PKT_TYPES_MASK_NO_2_DH1 + BTM_ACL_PKT_TYPES_MASK_NO_2_DH3 +

         BTM_ACL_PKT_TYPES_MASK_NO_2_DH5);

        (HCI_PKT_TYPES_MASK_NO_2_DH1 + HCI_PKT_TYPES_MASK_NO_2_DH3 +

         HCI_PKT_TYPES_MASK_NO_2_DH5);

  }



  if (!controller->supports_classic_3m_phy()) {

    btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

        (BTM_ACL_PKT_TYPES_MASK_NO_3_DH1 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH3 +

         BTM_ACL_PKT_TYPES_MASK_NO_3_DH5);

        (HCI_PKT_TYPES_MASK_NO_3_DH1 + HCI_PKT_TYPES_MASK_NO_3_DH3 +

         HCI_PKT_TYPES_MASK_NO_3_DH5);

  }



  /* Check to see if 3 and 5 slot packets are available */
@@ -159,11 +160,11 @@ void BTM_acl_after_controller_started() { 
      controller->supports_classic_3m_phy()) {

    if (!controller->supports_3_slot_edr_packets())

      btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

          (BTM_ACL_PKT_TYPES_MASK_NO_2_DH3 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH3);

          (HCI_PKT_TYPES_MASK_NO_2_DH3 + HCI_PKT_TYPES_MASK_NO_3_DH3);



    if (!controller->supports_5_slot_edr_packets())

      btm_cb.acl_cb_.btm_acl_pkt_types_supported |=

          (BTM_ACL_PKT_TYPES_MASK_NO_2_DH5 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH5);

          (HCI_PKT_TYPES_MASK_NO_2_DH5 + HCI_PKT_TYPES_MASK_NO_3_DH5);

  }



  BTM_TRACE_DEBUG("Local supported ACL packet types: 0x%04x",
@@ -322,9 +323,8 @@ void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data) { 
 * Returns          void

 *

 ******************************************************************************/

void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,

                     uint16_t hci_handle, uint8_t link_role,

                     tBT_TRANSPORT transport) {

void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,

                     uint8_t link_role, tBT_TRANSPORT transport) {

  tBTM_SEC_DEV_REC* p_dev_rec = NULL;

  tACL_CONN* p;

  uint8_t xx;
@@ -385,10 +385,6 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn, 
      BTM_TRACE_DEBUG("btm_pm_sm_alloc ind:%d st:%d", xx, p_db->state);

#endif  // BTM_PM_DEBUG



      if (dc) memcpy(p->remote_dc, dc, DEV_CLASS_LEN);



      if (bdn) memcpy(p->remote_name, bdn, BTM_MAX_REM_BD_NAME_LEN);



      /* if BR/EDR do something more */

      if (transport == BT_TRANSPORT_BR_EDR) {

        btsnd_hcic_read_rmt_clk_offset(p->hci_handle);
@@ -1716,29 +1712,29 @@ uint16_t BTM_GetMaxPacketSize(const RawAddress& addr) { 
  }



  if (pkt_types) {

    if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_3_DH5))

    if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_3_DH5))

      pkt_size = HCI_EDR3_DH5_PACKET_SIZE;

    else if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_2_DH5))

    else if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_2_DH5))

      pkt_size = HCI_EDR2_DH5_PACKET_SIZE;

    else if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_3_DH3))

    else if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_3_DH3))

      pkt_size = HCI_EDR3_DH3_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DH5)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DH5)

      pkt_size = HCI_DH5_PACKET_SIZE;

    else if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_2_DH3))

    else if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_2_DH3))

      pkt_size = HCI_EDR2_DH3_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DM5)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DM5)

      pkt_size = HCI_DM5_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DH3)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DH3)

      pkt_size = HCI_DH3_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DM3)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DM3)

      pkt_size = HCI_DM3_PACKET_SIZE;

    else if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_3_DH1))

    else if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_3_DH1))

      pkt_size = HCI_EDR3_DH1_PACKET_SIZE;

    else if (!(pkt_types & BTM_ACL_PKT_TYPES_MASK_NO_2_DH1))

    else if (!(pkt_types & HCI_PKT_TYPES_MASK_NO_2_DH1))

      pkt_size = HCI_EDR2_DH1_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DH1)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DH1)

      pkt_size = HCI_DH1_PACKET_SIZE;

    else if (pkt_types & BTM_ACL_PKT_TYPES_MASK_DM1)

    else if (pkt_types & HCI_PKT_TYPES_MASK_DM1)

      pkt_size = HCI_DM1_PACKET_SIZE;

  }
@@ -2489,23 +2485,21 @@ void btm_acl_notif_conn_collision(const RawAddress& bda) { 
void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p, uint16_t* p_pkt_type) {

  /* 3 and 5 slot packets? */

  if (!HCI_3_SLOT_PACKETS_SUPPORTED(p->peer_lmp_feature_pages[0]))

    *p_pkt_type &= ~(BTM_ACL_PKT_TYPES_MASK_DH3 + BTM_ACL_PKT_TYPES_MASK_DM3);

    *p_pkt_type &= ~(HCI_PKT_TYPES_MASK_DH3 + HCI_PKT_TYPES_MASK_DM3);



  if (!HCI_5_SLOT_PACKETS_SUPPORTED(p->peer_lmp_feature_pages[0]))

    *p_pkt_type &= ~(BTM_ACL_PKT_TYPES_MASK_DH5 + BTM_ACL_PKT_TYPES_MASK_DM5);

    *p_pkt_type &= ~(HCI_PKT_TYPES_MASK_DH5 + HCI_PKT_TYPES_MASK_DM5);



  /* 2 and 3 MPS support? */

  if (!HCI_EDR_ACL_2MPS_SUPPORTED(p->peer_lmp_feature_pages[0]))

    /* Not supported. Add 'not_supported' mask for all 2MPS packet types */

    *p_pkt_type |=

        (BTM_ACL_PKT_TYPES_MASK_NO_2_DH1 + BTM_ACL_PKT_TYPES_MASK_NO_2_DH3 +

         BTM_ACL_PKT_TYPES_MASK_NO_2_DH5);

    *p_pkt_type |= (HCI_PKT_TYPES_MASK_NO_2_DH1 + HCI_PKT_TYPES_MASK_NO_2_DH3 +

                    HCI_PKT_TYPES_MASK_NO_2_DH5);



  if (!HCI_EDR_ACL_3MPS_SUPPORTED(p->peer_lmp_feature_pages[0]))

    /* Not supported. Add 'not_supported' mask for all 3MPS packet types */

    *p_pkt_type |=

        (BTM_ACL_PKT_TYPES_MASK_NO_3_DH1 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH3 +

         BTM_ACL_PKT_TYPES_MASK_NO_3_DH5);

    *p_pkt_type |= (HCI_PKT_TYPES_MASK_NO_3_DH1 + HCI_PKT_TYPES_MASK_NO_3_DH3 +

                    HCI_PKT_TYPES_MASK_NO_3_DH5);



  /* EDR 3 and 5 slot support? */

  if (HCI_EDR_ACL_2MPS_SUPPORTED(p->peer_lmp_feature_pages[0]) ||
@@ -2514,13 +2508,13 @@ void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p, uint16_t* p_pkt_type) { 
      /* Not supported. Add 'not_supported' mask for all 3-slot EDR packet types

       */

      *p_pkt_type |=

          (BTM_ACL_PKT_TYPES_MASK_NO_2_DH3 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH3);

          (HCI_PKT_TYPES_MASK_NO_2_DH3 + HCI_PKT_TYPES_MASK_NO_3_DH3);



    if (!HCI_5_SLOT_EDR_ACL_SUPPORTED(p->peer_lmp_feature_pages[0]))

      /* Not supported. Add 'not_supported' mask for all 5-slot EDR packet types

       */

      *p_pkt_type |=

          (BTM_ACL_PKT_TYPES_MASK_NO_2_DH5 + BTM_ACL_PKT_TYPES_MASK_NO_3_DH5);

          (HCI_PKT_TYPES_MASK_NO_2_DH5 + HCI_PKT_TYPES_MASK_NO_3_DH5);

  }

}
@@ -2949,3 +2943,16 @@ void acl_create_classic_connection(const RawAddress& bd_addr, 
                         page_scan_mode, clock_offset, allow_role_switch);

  btm_acl_set_paging(true);

}



void btm_acl_connection_request(const RawAddress& bda, uint8_t* dc) {

  btm_sec_conn_req(bda, dc);

  l2c_link_hci_conn_req(bda);

}



void acl_accept_connection_request(const RawAddress& bd_addr, uint8_t role) {

  btsnd_hcic_accept_conn(bd_addr, role);

}



void acl_reject_connection_request(const RawAddress& bd_addr, uint8_t reason) {

  btsnd_hcic_reject_conn(bd_addr, reason);

}

system/stack/btm/btm_dev.cc

+37 −27
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ tBTM_SEC_DEV_REC* btm_sec_alloc_dev(const RawAddress& bd_addr) { 


/*******************************************************************************

 *

 * Function         btm_dev_support_switch

 * Function         btm_dev_support_role_switch

 *

 * Description      This function is called by the L2CAP to check if remote

 *                  device supports role switch
@@ -275,40 +275,50 @@ tBTM_SEC_DEV_REC* btm_sec_alloc_dev(const RawAddress& bd_addr) { 
 * Parameters:      bd_addr       - Address of the peer device

 *

 * Returns          true if device is known and role switch is supported

 *                  for the link.

 *

 ******************************************************************************/

bool btm_dev_support_switch(const RawAddress& bd_addr) {

  tBTM_SEC_DEV_REC* p_dev_rec;

  uint8_t xx;

  bool feature_empty = true;

bool btm_dev_support_role_switch(const RawAddress& bd_addr) {

  if (BTM_IsScoActiveByBdaddr(bd_addr)) {

    BTM_TRACE_DEBUG("%s Role switch is not allowed if a SCO is up", __func__);

    return false;

  }



  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  if (p_dev_rec == nullptr) {

    BTM_TRACE_DEBUG("%s Unknown address for role switch", __func__);

    return false;

  }



  if (!controller_get_interface()->supports_master_slave_role_switch()) {

    BTM_TRACE_DEBUG("%s Local controller does not support role switch",

                    __func__);

    return false;

  }



  /* Role switch is not allowed if a SCO is up */

  if (BTM_IsScoActiveByBdaddr(bd_addr)) return (false);

  p_dev_rec = btm_find_dev(bd_addr);

  if (p_dev_rec &&

      controller_get_interface()->supports_master_slave_role_switch()) {

  if (HCI_SWITCH_SUPPORTED(p_dev_rec->feature_pages[0])) {

      BTM_TRACE_DEBUG("btm_dev_support_switch return true (feature found)");

      return (true);

    BTM_TRACE_DEBUG("%s Peer controller supports role switch", __func__);

    return true;

  }



  /* If the feature field is all zero, we never received them */

    for (xx = 0; xx < BD_FEATURES_LEN; xx++) {

  bool feature_empty = true;

  for (int xx = 0; xx < BD_FEATURES_LEN; xx++) {

    if (p_dev_rec->feature_pages[0][xx] != 0x00) {

      feature_empty = false; /* at least one is != 0 */

      break;

    }

  }



    /* If we don't know peer's capabilities, assume it supports Role-switch */

  if (feature_empty) {

      BTM_TRACE_DEBUG("btm_dev_support_switch return true (feature empty)");

      return (true);

    }

    BTM_TRACE_DEBUG(

        "%s Unknown peer capabilities, assuming peer supports role switch",

        __func__);

    return true;

  }



  BTM_TRACE_DEBUG("btm_dev_support_switch return false");

  return (false);

  BTM_TRACE_DEBUG("%s Peer controller does not support role switch", __func__);

  return false;

}



bool is_handle_equal(void* data, void* context) {