Merge "Dead code removal: AclManager SetLeSuggestedDefaultDataParameters" into main

4 files changed, 0 insertions, 23 deletions

diff --git a/system/gd/hci/acl_manager.cc b/system/gd/hci/acl_manager.cc
index 68137fe373..280cc237b4 100644
--- a/system/gd/hci/acl_manager.cc
+++ b/system/gd/hci/acl_manager.cc
@@ -260,10 +260,6 @@ void AclManager::CreateLeConnection(AddressWithType address_with_type, bool is_d
   CallOn(pimpl_->le_impl_, &le_impl::create_le_connection, address_with_type, true, is_direct);
 }
 
-void AclManager::SetLeSuggestedDefaultDataParameters(uint16_t octets, uint16_t time) {
-  CallOn(pimpl_->le_impl_, &le_impl::set_le_suggested_default_data_parameters, octets, time);
-}
-
 void AclManager::SetPrivacyPolicyForInitiatorAddress(
         LeAddressManager::AddressPolicy address_policy, AddressWithType fixed_address,
         std::chrono::milliseconds minimum_rotation_time,
diff --git a/system/gd/hci/acl_manager.h b/system/gd/hci/acl_manager.h
index 1428c52d7c..f38f1ff689 100644
--- a/system/gd/hci/acl_manager.h
+++ b/system/gd/hci/acl_manager.h
@@ -86,9 +86,6 @@ public:
   // Generates OnLeConnectSuccess if connected, or OnLeConnectFail otherwise
   virtual void CreateLeConnection(AddressWithType address_with_type, bool is_direct);
 
-  // Ask the controller for specific data parameters
-  virtual void SetLeSuggestedDefaultDataParameters(uint16_t octets, uint16_t time);
-
   virtual void SetPrivacyPolicyForInitiatorAddress(LeAddressManager::AddressPolicy address_policy,
                                                    AddressWithType fixed_address,
                                                    std::chrono::milliseconds minimum_rotation_time,
diff --git a/system/gd/hci/acl_manager/le_impl.h b/system/gd/hci/acl_manager/le_impl.h
index 5d57ca2418..ef5bfb0d7d 100644
--- a/system/gd/hci/acl_manager/le_impl.h
+++ b/system/gd/hci/acl_manager/le_impl.h
@@ -1149,12 +1149,6 @@ public:
     remove_device_from_accept_list(address_with_type);
   }
 
-  void set_le_suggested_default_data_parameters(uint16_t length, uint16_t time) {
-    auto packet = LeWriteSuggestedDefaultDataLengthBuilder::Create(length, time);
-    le_acl_connection_interface_->EnqueueCommand(
-            std::move(packet), handler_->BindOnce([](CommandCompleteView /* complete */) {}));
-  }
-
   void clear_resolving_list() { le_address_manager_->ClearResolvingList(); }
 
   void set_privacy_policy_for_initiator_address(LeAddressManager::AddressPolicy address_policy,
diff --git a/system/gd/hci/acl_manager/le_impl_test.cc b/system/gd/hci/acl_manager/le_impl_test.cc
index af0d4f15cb..274b6827c9 100644
--- a/system/gd/hci/acl_manager/le_impl_test.cc
+++ b/system/gd/hci/acl_manager/le_impl_test.cc
@@ -1475,16 +1475,6 @@ TEST_F(LeImplTest, cancel_connect) {
   ASSERT_TRUE(le_impl_->create_connection_timeout_alarms_.empty());
 }
 
-TEST_F(LeImplTest, set_le_suggested_default_data_parameters) {
-  le_impl_->set_le_suggested_default_data_parameters(kLength, kTime);
-  sync_handler();
-  auto view = CreateLeConnectionManagementCommandView<LeWriteSuggestedDefaultDataLengthView>(
-          hci_layer_->GetCommand());
-  ASSERT_TRUE(view.IsValid());
-  ASSERT_EQ(kLength, view.GetTxOctets());
-  ASSERT_EQ(kTime, view.GetTxTime());
-}
-
 enum class ConnectionCompleteType { CONNECTION_COMPLETE, ENHANCED_CONNECTION_COMPLETE };
 
 class LeImplTestParameterizedByConnectionCompleteEventType