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

Commit c30e033d authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap: LE address type is not used am: b46e4122 am: 7e6a3594 

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

Change-Id: I772391fe5bc80a71b94ee11a18617d2495ee40d3
parents 94d4c3d3 7e6a3594

system/stack/l2cap/l2c_int.h

+0 −2
Original line number Diff line number Diff line
@@ -399,8 +399,6 @@ typedef struct t_l2c_linkcb { 
  bool is_transport_br_edr() const { return transport == BT_TRANSPORT_BR_EDR; }

  bool is_transport_ble() const { return transport == BT_TRANSPORT_LE; }



  uint8_t initiating_phys;  // LE PHY used for connection initiation

  tBLE_ADDR_TYPE ble_addr_type;

  uint16_t tx_data_len; /* tx data length used in data length extension */

  fixed_queue_t* le_sec_pending_q; /* LE coc channels waiting for security check

                                      completion */

system/stack/l2cap/l2c_utils.cc

+0 −7
Original line number Diff line number Diff line
@@ -1970,16 +1970,9 @@ bool l2cu_create_conn_le(tL2C_LCB* p_lcb) { 
/* This function initiates an acl connection to a LE device.

 * Returns true if request started successfully, false otherwise. */

bool l2cu_create_conn_le(tL2C_LCB* p_lcb, uint8_t initiating_phys) {

  tBT_DEVICE_TYPE dev_type;

  tBLE_ADDR_TYPE addr_type;



  BTM_ReadDevInfo(p_lcb->remote_bd_addr, &dev_type, &addr_type);



  if (!controller_get_interface()->supports_ble()) return false;



  p_lcb->ble_addr_type = addr_type;

  p_lcb->transport = BT_TRANSPORT_LE;

  p_lcb->initiating_phys = initiating_phys;



  return (l2cble_create_conn(p_lcb));

}