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

Commit 42b0a29d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Add le transport to BTM_ReadRemoteVersion am: fab74444 am: 7f69707d am: 3aed3488 

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

Change-Id: I58ba6e44673d2196351e8dc9b62e1ad5bcb2a5df
parents d527763f 3aed3488

system/stack/acl/btm_acl.cc

+10 −7
Original line number Diff line number Diff line
@@ -1496,17 +1496,20 @@ uint16_t BTM_GetMaxPacketSize(const RawAddress& addr) { 


bool BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                           uint16_t* manufacturer, uint16_t* lmp_sub_version) {

  tACL_CONN* p = internal_.btm_bda_to_acl(addr, BT_TRANSPORT_BR_EDR);

  if (p == NULL) {

  const tACL_CONN* p_acl = internal_.btm_bda_to_acl(addr, BT_TRANSPORT_BR_EDR);

  if (p_acl == nullptr) {

    p_acl = internal_.btm_bda_to_acl(addr, BT_TRANSPORT_LE);

    if (p_acl == nullptr) {

      LOG_WARN("Unable to find active acl");

      return false;

    }

  }



  if (lmp_version) *lmp_version = p->lmp_version;

  if (lmp_version) *lmp_version = p_acl->lmp_version;



  if (manufacturer) *manufacturer = p->manufacturer;

  if (manufacturer) *manufacturer = p_acl->manufacturer;



  if (lmp_sub_version) *lmp_sub_version = p->lmp_subversion;

  if (lmp_sub_version) *lmp_sub_version = p_acl->lmp_subversion;



  return true;

}