diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc index 5f1aa9ff119f432031fe8e67563ae9db5dcce114..f3080da49bfb6b0d73089ad5cf1aac5ce6e499ce 100644 --- a/system/main/shim/acl.cc +++ b/system/main/shim/acl.cc @@ -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()); } } } diff --git a/system/stack/acl/acl.h b/system/stack/acl/acl.h index 9c4c9e65ee7c6a0f367b05389da1c023f14e7753..d114cdabae2df1f9010b925c8dc4224d563349e7 100644 --- a/system/stack/acl/acl.h +++ b/system/stack/acl/acl.h @@ -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: