From 084810b413b6342dea5b2db51966d2b0c1bc4441 Mon Sep 17 00:00:00 2001
From: Martin Brabham <optedoblivion@google.com>
Date: Thu, 21 Apr 2022 14:22:39 +0000
Subject: [PATCH] GD ACL: 'clear_connect_list' to 'clear_filter_accept_list'
Bug: 229047843
Test: mma -j $(nproc)
Test: ./build.py
Test: gd/cert/run
Tag: #compatibility
Change-Id: Ida86098b8f2d23be0a17cdca2a3a9d2640df425a
---
system/gd/hci/acl_manager.cc | 2 +-
system/gd/hci/acl_manager/le_impl.h | 2 +-
system/gd/hci/hci_metrics_logging.cc | 12 ++++++------
system/gd/hci/le_address_manager_test.cc | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/system/gd/hci/acl_manager.cc b/system/gd/hci/acl_manager.cc
index 464d40d1df8..9c8cda16ad1 100644
--- a/system/gd/hci/acl_manager.cc
+++ b/system/gd/hci/acl_manager.cc
@@ -219,7 +219,7 @@ void AclManager::RemoveDeviceFromFilterAcceptList(AddressWithType address_with_t
}
void AclManager::ClearFilterAcceptList() {
- CallOn(pimpl_->le_impl_, &le_impl::clear_connect_list);
+ CallOn(pimpl_->le_impl_, &le_impl::clear_filter_accept_list);
}
void AclManager::AddDeviceToResolvingList(
diff --git a/system/gd/hci/acl_manager/le_impl.h b/system/gd/hci/acl_manager/le_impl.h
index 377939eb856..1a58cba3d1b 100644
--- a/system/gd/hci/acl_manager/le_impl.h
+++ b/system/gd/hci/acl_manager/le_impl.h
@@ -578,7 +578,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
address_with_type.ToFilterAcceptListAddressType(), address_with_type.GetAddress());
}
- void clear_connect_list() {
+ void clear_filter_accept_list() {
connect_list.clear();
register_with_address_manager();
le_address_manager_->ClearFilterAcceptList();
diff --git a/system/gd/hci/hci_metrics_logging.cc b/system/gd/hci/hci_metrics_logging.cc
index 1164408000b..dd27517cf9a 100644
--- a/system/gd/hci/hci_metrics_logging.cc
+++ b/system/gd/hci/hci_metrics_logging.cc
@@ -192,9 +192,9 @@ void log_link_layer_connection_command(std::unique_ptr<CommandView>& command_vie
break;
}
case OpCode::LE_CLEAR_FILTER_ACCEPT_LIST: {
- auto le_clear_connect_list_view = LeClearFilterAcceptListView::Create(
+ auto le_clear_filter_accept_list_view = LeClearFilterAcceptListView::Create(
LeConnectionManagementCommandView::Create(std::move(connection_management_command_view)));
- ASSERT(le_clear_connect_list_view.IsValid());
+ ASSERT(le_clear_filter_accept_list_view.IsValid());
direction = android::bluetooth::DIRECTION_INCOMING;
link_type = android::bluetooth::LINK_TYPE_ACL;
break;
@@ -372,9 +372,9 @@ void log_link_layer_connection_command_status(std::unique_ptr<CommandView>& comm
break;
}
case OpCode::LE_CLEAR_FILTER_ACCEPT_LIST: {
- auto le_clear_connect_list_view = LeClearFilterAcceptListView::Create(
+ auto le_clear_filter_accept_list_view = LeClearFilterAcceptListView::Create(
LeConnectionManagementCommandView::Create(std::move(connection_management_command_view)));
- ASSERT(le_clear_connect_list_view.IsValid());
+ ASSERT(le_clear_filter_accept_list_view.IsValid());
direction = android::bluetooth::DIRECTION_INCOMING;
link_type = android::bluetooth::LINK_TYPE_ACL;
break;
@@ -434,9 +434,9 @@ void log_link_layer_connection_command_complete(EventView event_view, std::uniqu
switch (op_code) {
case OpCode::LE_CLEAR_FILTER_ACCEPT_LIST: {
- auto le_clear_connect_list_view = LeClearFilterAcceptListView::Create(
+ auto le_clear_filter_accept_list_view = LeClearFilterAcceptListView::Create(
LeConnectionManagementCommandView::Create(std::move(connection_management_command_view)));
- ASSERT(le_clear_connect_list_view.IsValid());
+ ASSERT(le_clear_filter_accept_list_view.IsValid());
direction = android::bluetooth::DIRECTION_INCOMING;
link_type = android::bluetooth::LINK_TYPE_ACL;
break;
diff --git a/system/gd/hci/le_address_manager_test.cc b/system/gd/hci/le_address_manager_test.cc
index 9e76fece100..37662fbf622 100644
--- a/system/gd/hci/le_address_manager_test.cc
+++ b/system/gd/hci/le_address_manager_test.cc
@@ -362,7 +362,7 @@ TEST_F(LeAddressManagerWithSingleClientTest, remove_device_from_connect_list) {
clients[0].get()->WaitForResume();
}
-TEST_F(LeAddressManagerWithSingleClientTest, clear_connect_list) {
+TEST_F(LeAddressManagerWithSingleClientTest, clear_filter_accept_list) {
Address address;
Address::FromString("01:02:03:04:05:06", address);
test_hci_layer_->SetCommandFuture();
--
GitLab