Merge "Get rid of unnecessary boilerplate for LeSetDefaultSubrate" into main

17 files changed, 0 insertions, 144 deletions

diff --git a/system/gd/hci/acl_manager.cc b/system/gd/hci/acl_manager.cc
index 26b0ce70eb..68137fe373 100644
--- a/system/gd/hci/acl_manager.cc
+++ b/system/gd/hci/acl_manager.cc
@@ -264,12 +264,6 @@ void AclManager::SetLeSuggestedDefaultDataParameters(uint16_t octets, uint16_t t
   CallOn(pimpl_->le_impl_, &le_impl::set_le_suggested_default_data_parameters, octets, time);
 }
 
-void AclManager::LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,
-                                     uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout) {
-  CallOn(pimpl_->le_impl_, &le_impl::LeSetDefaultSubrate, subrate_min, subrate_max, max_latency,
-         cont_num, sup_tout);
-}
-
 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 2b3d523b1f..1428c52d7c 100644
--- a/system/gd/hci/acl_manager.h
+++ b/system/gd/hci/acl_manager.h
@@ -89,9 +89,6 @@ public:
   // Ask the controller for specific data parameters
   virtual void SetLeSuggestedDefaultDataParameters(uint16_t octets, uint16_t time);
 
-  virtual void LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                                   uint16_t cont_num, uint16_t sup_tout);
-
   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 ce93f46e7e..5d57ca2418 100644
--- a/system/gd/hci/acl_manager/le_impl.h
+++ b/system/gd/hci/acl_manager/le_impl.h
@@ -1155,19 +1155,6 @@ public:
             std::move(packet), handler_->BindOnce([](CommandCompleteView /* complete */) {}));
   }
 
-  void LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                           uint16_t cont_num, uint16_t sup_tout) {
-    le_acl_connection_interface_->EnqueueCommand(
-            LeSetDefaultSubrateBuilder::Create(subrate_min, subrate_max, max_latency, cont_num,
-                                               sup_tout),
-            handler_->BindOnce([](CommandCompleteView complete) {
-              auto complete_view = LeSetDefaultSubrateCompleteView::Create(complete);
-              log::assert_that(complete_view.IsValid(), "assert failed: complete_view.IsValid()");
-              ErrorCode status = complete_view.GetStatus();
-              log::assert_that(status == ErrorCode::SUCCESS, "Status = {}", ErrorCodeText(status));
-            }));
-  }
-
   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 66bc16bbd8..af0d4f15cb 100644
--- a/system/gd/hci/acl_manager/le_impl_test.cc
+++ b/system/gd/hci/acl_manager/le_impl_test.cc
@@ -1485,19 +1485,6 @@ TEST_F(LeImplTest, set_le_suggested_default_data_parameters) {
   ASSERT_EQ(kTime, view.GetTxTime());
 }
 
-TEST_F(LeImplTest, LeSetDefaultSubrate) {
-  le_impl_->LeSetDefaultSubrate(kIntervalMin, kIntervalMax, kLatency, kContinuationNumber,
-                                kTimeout);
-  sync_handler();
-  auto view = CreateAclCommandView<LeSetDefaultSubrateView>(hci_layer_->GetCommand());
-  ASSERT_TRUE(view.IsValid());
-  ASSERT_EQ(kIntervalMin, view.GetSubrateMin());
-  ASSERT_EQ(kIntervalMax, view.GetSubrateMax());
-  ASSERT_EQ(kLatency, view.GetMaxLatency());
-  ASSERT_EQ(kContinuationNumber, view.GetContinuationNumber());
-  ASSERT_EQ(kTimeout, view.GetSupervisionTimeout());
-}
-
 enum class ConnectionCompleteType { CONNECTION_COMPLETE, ENHANCED_CONNECTION_COMPLETE };
 
 class LeImplTestParameterizedByConnectionCompleteEventType
diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc
index b2f0e23975..b01bd1f92d 100644
--- a/system/main/shim/acl.cc
+++ b/system/main/shim/acl.cc
@@ -969,11 +969,6 @@ struct shim::Acl::impl {
             maximum_latency, minimum_remote_timeout, minimum_local_timeout);
   }
 
-  void LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                           uint16_t cont_num, uint16_t sup_tout) {
-    GetAclManager()->LeSetDefaultSubrate(subrate_min, subrate_max, max_latency, cont_num, sup_tout);
-  }
-
   void LeSubrateRequest(HciHandle handle, uint16_t subrate_min, uint16_t subrate_max,
                         uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout) {
     if (IsLeAcl(handle)) {
@@ -1573,12 +1568,6 @@ void shim::Acl::UpdateConnectionParameters(uint16_t handle, uint16_t conn_int_mi
                    conn_int_max, conn_latency, conn_timeout, min_ce_len, max_ce_len);
 }
 
-void shim::Acl::LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,
-                                    uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout) {
-  handler_->CallOn(pimpl_.get(), &Acl::impl::LeSetDefaultSubrate, subrate_min, subrate_max,
-                   max_latency, cont_num, sup_tout);
-}
-
 void shim::Acl::LeSubrateRequest(uint16_t hci_handle, uint16_t subrate_min, uint16_t subrate_max,
                                  uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout) {
   handler_->CallOn(pimpl_.get(), &Acl::impl::LeSubrateRequest, hci_handle, subrate_min, subrate_max,
diff --git a/system/main/shim/acl.h b/system/main/shim/acl.h
index bbe15d0acf..8253faf013 100644
--- a/system/main/shim/acl.h
+++ b/system/main/shim/acl.h
@@ -80,8 +80,6 @@ public:
   void RemoveFromAddressResolution(const hci::AddressWithType& address_with_type);
   void ClearAddressResolution();
 
-  void LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                           uint16_t cont_num, uint16_t sup_tout);
   void LeSubrateRequest(uint16_t hci_handle, uint16_t subrate_min, uint16_t subrate_max,
                         uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout);
 
diff --git a/system/main/shim/acl_api.cc b/system/main/shim/acl_api.cc
index 56e63e1977..0868f40f2c 100644
--- a/system/main/shim/acl_api.cc
+++ b/system/main/shim/acl_api.cc
@@ -166,12 +166,6 @@ void bluetooth::shim::ACL_ClearAddressResolution() {
 void bluetooth::shim::ACL_ClearFilterAcceptList() {
   Stack::GetInstance()->GetAcl()->ClearFilterAcceptList();
 }
-void bluetooth::shim::ACL_LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,
-                                              uint16_t max_latency, uint16_t cont_num,
-                                              uint16_t sup_tout) {
-  Stack::GetInstance()->GetAcl()->LeSetDefaultSubrate(subrate_min, subrate_max, max_latency,
-                                                      cont_num, sup_tout);
-}
 
 void bluetooth::shim::ACL_LeSubrateRequest(uint16_t hci_handle, uint16_t subrate_min,
                                            uint16_t subrate_max, uint16_t max_latency,
diff --git a/system/main/shim/acl_api.h b/system/main/shim/acl_api.h
index 6b28988ca6..b0bac16e02 100644
--- a/system/main/shim/acl_api.h
+++ b/system/main/shim/acl_api.h
@@ -49,8 +49,6 @@ void ACL_AddToAddressResolution(const tBLE_BD_ADDR& legacy_address_with_type,
 void ACL_RemoveFromAddressResolution(const tBLE_BD_ADDR& legacy_address_with_type);
 void ACL_ClearAddressResolution();
 void ACL_ClearFilterAcceptList();
-void ACL_LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                             uint16_t cont_num, uint16_t sup_tout);
 void ACL_SendConnectionParameterUpdateRequest(uint16_t handle, uint16_t conn_int_min,
                                               uint16_t conn_int_max, uint16_t conn_latency,
                                               uint16_t conn_timeout, uint16_t min_ce_len,
diff --git a/system/stack/include/l2cap_interface.h b/system/stack/include/l2cap_interface.h
index b1551d2a80..19f85d4d2e 100644
--- a/system/stack/include/l2cap_interface.h
+++ b/system/stack/include/l2cap_interface.h
@@ -871,21 +871,6 @@ public:
   virtual void L2CA_SetEcosystemBaseInterval(uint32_t base_interval) = 0;
 
   /*******************************************************************************
-   *
-   *  Function        L2CA_SetDefaultSubrate
-   *
-   *  Description     BLE Set Default Subrate.
-   *
-   *  Parameters:     Subrate parameters
-   *
-   *  Return value:   void
-   *
-   ******************************************************************************/
-  virtual void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,
-                                      uint16_t max_latency, uint16_t cont_num,
-                                      uint16_t timeout) = 0;
-
-  /*******************************************************************************
    **
    ** Function         L2CA_SetMediaStreamChannel
    **
diff --git a/system/stack/l2cap/internal/l2c_api.h b/system/stack/l2cap/internal/l2c_api.h
index dd1dbf52e6..989eccf50e 100644
--- a/system/stack/l2cap/internal/l2c_api.h
+++ b/system/stack/l2cap/internal/l2c_api.h
@@ -719,20 +719,6 @@ void L2CA_SetEcosystemBaseInterval(uint32_t base_interval);
 
 /*******************************************************************************
  *
- *  Function        L2CA_SetDefaultSubrate
- *
- *  Description     BLE Set Default Subrate.
- *
- *  Parameters:     Subrate parameters
- *
- *  Return value:   void
- *
- ******************************************************************************/
-void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                            uint16_t cont_num, uint16_t timeout);
-
-/*******************************************************************************
- *
  *  Function        L2CA_SubrateRequest
  *
  *  Description     BLE Subrate request.
diff --git a/system/stack/l2cap/l2c_api.h b/system/stack/l2cap/l2c_api.h
index 1ff09ffaf5..f9eab67d55 100644
--- a/system/stack/l2cap/l2c_api.h
+++ b/system/stack/l2cap/l2c_api.h
@@ -73,8 +73,6 @@ public:
                                           uint8_t* p_chnl_mask) override;
   [[nodiscard]] bool L2CA_SetAclPriority(const RawAddress& bd_addr,
                                          tL2CAP_PRIORITY priority) override;
-  void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                              uint16_t cont_num, uint16_t timeout) override;
   void L2CA_AdjustConnectionIntervals(uint16_t* min_interval, uint16_t* max_interval,
                                       uint16_t floor_interval) override;
   void L2CA_SetEcosystemBaseInterval(uint32_t base_interval) override;
diff --git a/system/stack/l2cap/l2c_ble_conn_params.cc b/system/stack/l2cap/l2c_ble_conn_params.cc
index 49eeb06155..392b1f5a74 100644
--- a/system/stack/l2cap/l2c_ble_conn_params.cc
+++ b/system/stack/l2cap/l2c_ble_conn_params.cc
@@ -510,26 +510,6 @@ static void l2cble_start_subrate_change(tL2C_LCB* p_lcb) {
 
 /*******************************************************************************
  *
- *  Function        L2CA_SetDefaultSubrate
- *
- *  Description     BLE Set Default Subrate
- *
- *  Parameters:     Subrate parameters
- *
- *  Return value:   void
- *
- ******************************************************************************/
-void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                            uint16_t cont_num, uint16_t timeout) {
-  log::verbose("subrate_min={}, subrate_max={}, max_latency={}, cont_num={}, timeout={}",
-               subrate_min, subrate_max, max_latency, cont_num, timeout);
-
-  bluetooth::shim::ACL_LeSetDefaultSubrate(subrate_min, subrate_max, max_latency, cont_num,
-                                           timeout);
-}
-
-/*******************************************************************************
- *
  *  Function        L2CA_SubrateRequest
  *
  *  Description     BLE Subrate request.
diff --git a/system/stack/l2cap/l2cap_api.cc b/system/stack/l2cap/l2cap_api.cc
index 0752c995c0..e9ccaeaf2a 100644
--- a/system/stack/l2cap/l2cap_api.cc
+++ b/system/stack/l2cap/l2cap_api.cc
@@ -234,13 +234,6 @@ void bluetooth::stack::l2cap::Impl::L2CA_SetEcosystemBaseInterval(uint32_t base_
   return ::L2CA_IsLinkEstablished(bd_addr, transport);
 }
 
-void bluetooth::stack::l2cap::Impl::L2CA_SetDefaultSubrate(uint16_t subrate_min,
-                                                           uint16_t subrate_max,
-                                                           uint16_t max_latency, uint16_t cont_num,
-                                                           uint16_t timeout) {
-  ::L2CA_SetDefaultSubrate(subrate_min, subrate_max, max_latency, cont_num, timeout);
-}
-
 [[nodiscard]] bool bluetooth::stack::l2cap::Impl::L2CA_SubrateRequest(
         const RawAddress& rem_bda, uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
         uint16_t cont_num, uint16_t timeout) {
diff --git a/system/test/mock/mock_main_shim_acl.cc b/system/test/mock/mock_main_shim_acl.cc
index a98e809ad0..5f58860347 100644
--- a/system/test/mock/mock_main_shim_acl.cc
+++ b/system/test/mock/mock_main_shim_acl.cc
@@ -129,12 +129,6 @@ void shim::Acl::DisconnectLe(uint16_t /* handle */, tHCI_STATUS /* reason */,
   inc_func_call_count(__func__);
 }
 
-void shim::Acl::LeSetDefaultSubrate(uint16_t /* subrate_min */, uint16_t /* subrate_max */,
-                                    uint16_t /* max_latency */, uint16_t /* cont_num */,
-                                    uint16_t /* sup_tout */) {
-  inc_func_call_count(__func__);
-}
-
 void shim::Acl::LeSubrateRequest(uint16_t /* hci_handle */, uint16_t /* subrate_min */,
                                  uint16_t /* subrate_max */, uint16_t /* max_latency */,
                                  uint16_t /* cont_num */, uint16_t /* sup_tout */) {
diff --git a/system/test/mock/mock_main_shim_acl_api.cc b/system/test/mock/mock_main_shim_acl_api.cc
index 3d257f1a5a..e3a3c9d63b 100644
--- a/system/test/mock/mock_main_shim_acl_api.cc
+++ b/system/test/mock/mock_main_shim_acl_api.cc
@@ -73,12 +73,6 @@ void bluetooth::shim::ACL_RemoveFromAddressResolution(
   inc_func_call_count(__func__);
 }
 void bluetooth::shim::ACL_ClearAddressResolution() { inc_func_call_count(__func__); }
-void bluetooth::shim::ACL_LeSetDefaultSubrate(uint16_t /* subrate_min */,
-                                              uint16_t /* subrate_max */,
-                                              uint16_t /* max_latency */, uint16_t /* cont_num */,
-                                              uint16_t /* sup_tout */) {
-  inc_func_call_count(__func__);
-}
 void bluetooth::shim::ACL_LeSubrateRequest(uint16_t /* hci_handle */, uint16_t /* subrate_min */,
                                            uint16_t /* subrate_max */, uint16_t /* max_latency */,
                                            uint16_t /* cont_num */, uint16_t /* sup_tout */) {
diff --git a/system/test/mock/mock_main_shim_acl_api.h b/system/test/mock/mock_main_shim_acl_api.h
index ab891673e3..29e27dbad3 100644
--- a/system/test/mock/mock_main_shim_acl_api.h
+++ b/system/test/mock/mock_main_shim_acl_api.h
@@ -84,21 +84,6 @@ struct ACL_ClearFilterAcceptList {
 };
 extern struct ACL_ClearFilterAcceptList ACL_ClearFilterAcceptList;
 
-// Name: ACL_LeSetDefaultSubrate
-// Params:
-// Return: void
-struct ACL_LeSetDefaultSubrate {
-  std::function<void(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                     uint16_t cont_num, uint16_t sup_tout)>
-          body{[](uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                  uint16_t cont_num, uint16_t sup_tout) {}};
-  void operator()(uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency,
-                  uint16_t cont_num, uint16_t sup_tout) {
-    body(subrate_min, subrate_max, max_latency, cont_num, sup_tout);
-  }
-};
-extern struct ACL_LeSetDefaultSubrate ACL_LeSetDefaultSubrate;
-
 // Name: ACL_LeSubrateRequest
 // Params:
 // Return: void
diff --git a/system/test/mock/mock_stack_l2cap_interface.h b/system/test/mock/mock_stack_l2cap_interface.h
index a5cd536777..b2fc3e0ae9 100644
--- a/system/test/mock/mock_stack_l2cap_interface.h
+++ b/system/test/mock/mock_stack_l2cap_interface.h
@@ -64,9 +64,6 @@ public:
   MOCK_METHOD(bool, L2CA_GetPeerFeatures,
               (const RawAddress& bd_addr, uint32_t* p_ext_feat, uint8_t* p_chnl_mask));
   MOCK_METHOD(bool, L2CA_SetAclPriority, (const RawAddress& bd_addr, tL2CAP_PRIORITY priority));
-  MOCK_METHOD(void, L2CA_SetDefaultSubrate,
-              (uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency, uint16_t cont_num,
-               uint16_t timeout));
   MOCK_METHOD(void, L2CA_AdjustConnectionIntervals,
               (uint16_t* min_interval, uint16_t* max_interval, uint16_t floor_interval));
   MOCK_METHOD(void, L2CA_SetEcosystemBaseInterval, (uint32_t base_interval));