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

Commit 355ff426 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Co-locate le address and le address types am: 4c715a22 

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

Change-Id: Ia9dc2048e786d5d6d7c4e6e979d02e88c9255d81
parents 9320919c 4c715a22

system/main/shim/acl.cc

+6 −4
Original line number Diff line number Diff line
@@ -1047,10 +1047,12 @@ void DumpsysAcl(int fd) { 
                  common::ToString(link.peer_le_features_valid).c_str(),

                  bd_features_text(link.peer_le_features).c_str());



      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s",

                  link.active_remote_addr.ToString().c_str());

      LOG_DUMPSYS(fd, "    [le] conn_addr:%s",

                  link.conn_addr.ToString().c_str());

      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s[%s]",

                  link.active_remote_addr.ToString().c_str(),

                  AddressTypeText(link.active_remote_addr_type).c_str());

      LOG_DUMPSYS(fd, "    [le] conn_addr:%s[%s]",

                  link.conn_addr.ToString().c_str(),

                  AddressTypeText(link.conn_addr_type).c_str());

    }

  }

}

system/stack/acl/acl.h

+3 −2
Original line number Diff line number Diff line
@@ -176,7 +176,10 @@ struct tACL_CONN { 
  bool peer_lmp_feature_valid[HCI_EXT_FEATURES_PAGE_MAX + 1];



  RawAddress active_remote_addr;

  tBLE_ADDR_TYPE active_remote_addr_type;

  RawAddress conn_addr;

  tBLE_ADDR_TYPE conn_addr_type;



  RawAddress remote_addr;

  bool in_use{false};
@@ -200,8 +203,6 @@ struct tACL_CONN { 
  uint16_t Handle() const { return hci_handle; }

  uint16_t link_super_tout;

  uint16_t pkt_types_mask;

  tBLE_ADDR_TYPE active_remote_addr_type;

  tBLE_ADDR_TYPE conn_addr_type;

  uint8_t disconnect_reason;



 private: