From abbcef84e125afc15d3f3f982aa6e07a465340aa Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Thu, 15 Feb 2024 23:11:12 +0000
Subject: [PATCH] Rename tTypedAddressTransport to tAclLinkSpec
tAclLinkSpec refers to ACL link specification.
Bug: 325522529
Test: mmm packages/modules/Bluetooth
Flag: EXEMPT no logical change
Change-Id: Ia1ba42d75f0ae49dd5e2c01933ffce4e5851b4e6
---
system/types/ble_address_with_type.h | 10 ++++----
.../test/ble_address_with_type_unittest.cc | 24 +++++++++----------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/system/types/ble_address_with_type.h b/system/types/ble_address_with_type.h
index 9dece14050d..5c0f5318c78 100644
--- a/system/types/ble_address_with_type.h
+++ b/system/types/ble_address_with_type.h
@@ -151,11 +151,11 @@ struct std::hash<tBLE_BD_ADDR> {
}
};
-struct tTypedAddressTransport {
+struct tAclLinkSpec {
tBLE_BD_ADDR addrt;
tBT_TRANSPORT transport;
- bool operator==(const tTypedAddressTransport rhs) const {
+ bool operator==(const tAclLinkSpec rhs) const {
if (rhs.addrt != addrt) return false;
if (rhs.transport == BT_TRANSPORT_AUTO || transport == BT_TRANSPORT_AUTO) {
@@ -165,11 +165,9 @@ struct tTypedAddressTransport {
return rhs.transport == transport;
}
- bool operator!=(const tTypedAddressTransport rhs) const {
- return !(*this == rhs);
- }
+ bool operator!=(const tAclLinkSpec rhs) const { return !(*this == rhs); }
- bool StrictlyEquals(const tTypedAddressTransport rhs) const {
+ bool StrictlyEquals(const tAclLinkSpec rhs) const {
return rhs.addrt == addrt && rhs.transport == transport;
}
diff --git a/system/types/test/ble_address_with_type_unittest.cc b/system/types/test/ble_address_with_type_unittest.cc
index dd057b4b9e1..60eaffb0c0c 100644
--- a/system/types/test/ble_address_with_type_unittest.cc
+++ b/system/types/test/ble_address_with_type_unittest.cc
@@ -100,20 +100,20 @@ TEST(BleAddressWithTypeTest, STREAM_TO_BLE_ADDR_TYPE) {
}
TEST(BleAddressWithTypeTest, TYPED_ADDRESS_TRANSPORT) {
- tTypedAddressTransport typedAddressTransportA = {
- {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_AUTO};
- tTypedAddressTransport typedAddressTransportB = {
- {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_BR_EDR};
- tTypedAddressTransport typedAddressTransportC = {
- {BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1}, BT_TRANSPORT_LE};
+ tAclLinkSpec linkSpecA = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},
+ BT_TRANSPORT_AUTO};
+ tAclLinkSpec linkSpecB = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},
+ BT_TRANSPORT_BR_EDR};
+ tAclLinkSpec linkSpecC = {{BLE_ADDR_PUBLIC, RAW_ADDRESS_TEST1},
+ BT_TRANSPORT_LE};
- ASSERT_EQ(typedAddressTransportA, typedAddressTransportB);
- ASSERT_EQ(typedAddressTransportA, typedAddressTransportC);
- ASSERT_NE(typedAddressTransportB, typedAddressTransportC);
+ ASSERT_EQ(linkSpecA, linkSpecB);
+ ASSERT_EQ(linkSpecA, linkSpecC);
+ ASSERT_NE(linkSpecB, linkSpecC);
- ASSERT_FALSE(typedAddressTransportA.StrictlyEquals(typedAddressTransportB));
- ASSERT_FALSE(typedAddressTransportA.StrictlyEquals(typedAddressTransportC));
- ASSERT_FALSE(typedAddressTransportB.StrictlyEquals(typedAddressTransportC));
+ ASSERT_FALSE(linkSpecA.StrictlyEquals(linkSpecB));
+ ASSERT_FALSE(linkSpecA.StrictlyEquals(linkSpecC));
+ ASSERT_FALSE(linkSpecB.StrictlyEquals(linkSpecC));
}
TEST(BleAddressWithTypeTest, BLE_ADDR_TYPE_TO_STREAM) {
--
GitLab