Merge "Use GD for ConnectionParameterUpdate" into main

18 files changed, 152 insertions, 80 deletions

diff --git a/system/gd/hci/acl_manager/le_acl_connection.cc b/system/gd/hci/acl_manager/le_acl_connection.cc
index 1201cfcde2..fa6a78ab27 100644
--- a/system/gd/hci/acl_manager/le_acl_connection.cc
+++ b/system/gd/hci/acl_manager/le_acl_connection.cc
@@ -19,6 +19,7 @@
 #include <bluetooth/log.h>
 
 #include "hci/acl_manager/le_connection_management_callbacks.h"
+#include "hci/event_checkers.h"
 #include "os/metrics.h"
 
 using bluetooth::hci::Address;
@@ -234,10 +235,7 @@ bool LeAclConnection::LeConnectionUpdate(
           supervision_timeout,
           min_ce_length,
           max_ce_length),
-      pimpl_->tracker.client_handler_->BindOnce([](CommandStatusView status) {
-        ASSERT(status.IsValid());
-        ASSERT(status.GetCommandOpCode() == OpCode::LE_CONNECTION_UPDATE);
-      }));
+      pimpl_->tracker.client_handler_->BindOnce(check_status<LeConnectionUpdateStatusView>));
   return true;
 }
 
diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc
index ad6a89fefb..1980b6c331 100644
--- a/system/main/shim/acl.cc
+++ b/system/main/shim/acl.cc
@@ -851,6 +851,13 @@ class LeShimAclConnection
     return connection_->IsInFilterAcceptList();
   }
 
+  void UpdateConnectionParameters(uint16_t conn_int_min, uint16_t conn_int_max,
+                                  uint16_t conn_latency, uint16_t conn_timeout,
+                                  uint16_t min_ce_len, uint16_t max_ce_len) {
+    connection_->LeConnectionUpdate(conn_int_min, conn_int_max, conn_latency,
+                                    conn_timeout, min_ce_len, max_ce_len);
+  }
+
  private:
   OnDisconnect on_disconnect_;
   const shim::legacy::acl_le_link_interface_t interface_;
@@ -1095,6 +1102,21 @@ struct shim::legacy::Acl::impl {
     }
   }
 
+  void update_connection_parameters(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,
+                                    uint16_t max_ce_len) {
+    auto connection = handle_to_le_connection_map_.find(handle);
+    if (connection == handle_to_le_connection_map_.end()) {
+      LOG_WARN("Unknown le connection handle:0x%04x", handle);
+      return;
+    }
+    connection->second->UpdateConnectionParameters(conn_int_min, conn_int_max,
+                                                   conn_latency, conn_timeout,
+                                                   min_ce_len, max_ce_len);
+  }
+
   void accept_le_connection_from(const hci::AddressWithType& address_with_type,
                                  bool is_direct, std::promise<bool> promise) {
     if (shadow_acceptlist_.IsFull()) {
@@ -1767,6 +1789,15 @@ void shim::legacy::Acl::DisconnectLe(uint16_t handle, tHCI_STATUS reason,
                    comment);
 }
 
+void shim::legacy::Acl::UpdateConnectionParameters(
+    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,
+    uint16_t max_ce_len) {
+  handler_->CallOn(pimpl_.get(), &Acl::impl::update_connection_parameters,
+                   handle, conn_int_min, conn_int_max, conn_latency,
+                   conn_timeout, min_ce_len, max_ce_len);
+}
+
 bool shim::legacy::Acl::HoldMode(uint16_t hci_handle, uint16_t max_interval,
                                  uint16_t min_interval) {
   handler_->CallOn(pimpl_.get(), &Acl::impl::HoldMode, hci_handle, max_interval,
diff --git a/system/main/shim/acl.h b/system/main/shim/acl.h
index 344e8dc608..ec659bd7b7 100644
--- a/system/main/shim/acl.h
+++ b/system/main/shim/acl.h
@@ -82,6 +82,10 @@ class Acl : public hci::acl_manager::ConnectionCallbacks,
                          std::string comment) override;
   void DisconnectLe(uint16_t handle, tHCI_REASON reason,
                     std::string comment) override;
+  void UpdateConnectionParameters(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,
+                                  uint16_t max_ce_len) override;
 
   // Address Resolution List
   void AddToAddressResolution(const hci::AddressWithType& address_with_type,
diff --git a/system/main/shim/acl_api.cc b/system/main/shim/acl_api.cc
index 702b59293e..2495d49b9a 100644
--- a/system/main/shim/acl_api.cc
+++ b/system/main/shim/acl_api.cc
@@ -76,6 +76,15 @@ void bluetooth::shim::ACL_Flush(uint16_t handle) {
   Stack::GetInstance()->GetAcl()->Flush(handle);
 }
 
+void bluetooth::shim::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,
+    uint16_t max_ce_len) {
+  Stack::GetInstance()->GetAcl()->UpdateConnectionParameters(
+      handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
+      min_ce_len, max_ce_len);
+}
+
 void bluetooth::shim::ACL_ConfigureLePrivacy(bool is_le_privacy_enabled) {
   hci::LeAddressManager::AddressPolicy address_policy =
       is_le_privacy_enabled
diff --git a/system/main/shim/acl_api.h b/system/main/shim/acl_api.h
index 1f6203bb6d..07ccfe1c69 100644
--- a/system/main/shim/acl_api.h
+++ b/system/main/shim/acl_api.h
@@ -60,6 +60,10 @@ 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,
+    uint16_t max_ce_len);
 void 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/main/shim/link_connection_interface.h b/system/main/shim/link_connection_interface.h
index 7788ae4cbe..86d5975ae9 100644
--- a/system/main/shim/link_connection_interface.h
+++ b/system/main/shim/link_connection_interface.h
@@ -44,6 +44,10 @@ class LinkConnectionInterface {
                                  std::string comment) = 0;
   virtual void DisconnectLe(uint16_t handle, tHCI_REASON reason,
                             std::string comment) = 0;
+  virtual void UpdateConnectionParameters(
+      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,
+      uint16_t max_ce_len) = 0;
 };
 
 }  // namespace shim
diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc
index fa1c71b7d9..9c5eef7860 100644
--- a/system/stack/acl/btm_acl.cc
+++ b/system/stack/acl/btm_acl.cc
@@ -2231,6 +2231,15 @@ bool acl_peer_supports_ble_connection_parameters_request(
   return HCI_LE_CONN_PARAM_REQ_SUPPORTED(p_acl->peer_le_features);
 }
 
+void acl_ble_connection_parameters_request(
+    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,
+    uint16_t max_ce_len) {
+  bluetooth::shim::ACL_SendConnectionParameterUpdateRequest(
+      handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
+      min_ce_len, max_ce_len);
+}
+
 bool acl_peer_supports_sniff_subrating(const RawAddress& remote_bda) {
   tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR);
   if (p_acl == nullptr) {
diff --git a/system/stack/hcic/hciblecmds.cc b/system/stack/hcic/hciblecmds.cc
index 37e307dd2a..5d77a44a97 100644
--- a/system/stack/hcic/hciblecmds.cc
+++ b/system/stack/hcic/hciblecmds.cc
@@ -225,33 +225,6 @@ void btsnd_hcic_ble_set_scan_enable(uint8_t scan_enable, uint8_t duplicate) {
   btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);
 }
 
-void btsnd_hcic_ble_upd_ll_conn_params(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,
-                                       uint16_t max_ce_len) {
-  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);
-  uint8_t* pp = (uint8_t*)(p + 1);
-
-  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_BLE_UPD_LL_CONN_PARAMS;
-  p->offset = 0;
-
-  UINT16_TO_STREAM(pp, HCI_BLE_UPD_LL_CONN_PARAMS);
-  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_BLE_UPD_LL_CONN_PARAMS);
-
-  UINT16_TO_STREAM(pp, handle);
-
-  UINT16_TO_STREAM(pp, conn_int_min);
-  UINT16_TO_STREAM(pp, conn_int_max);
-  UINT16_TO_STREAM(pp, conn_latency);
-  UINT16_TO_STREAM(pp, conn_timeout);
-  UINT16_TO_STREAM(pp, min_ce_len);
-  UINT16_TO_STREAM(pp, max_ce_len);
-
-  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);
-}
-
 void btsnd_hcic_ble_read_remote_feat(uint16_t handle) {
   BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);
   uint8_t* pp = (uint8_t*)(p + 1);
diff --git a/system/stack/include/acl_api.h b/system/stack/include/acl_api.h
index 6f5bc41514..0399765c89 100644
--- a/system/stack/include/acl_api.h
+++ b/system/stack/include/acl_api.h
@@ -204,6 +204,10 @@ void btm_establish_continue_from_address(const RawAddress& remote_bda,
 
 bool acl_peer_supports_ble_connection_parameters_request(
     const RawAddress& remote_bda);
+void acl_ble_connection_parameters_request(
+    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,
+    uint16_t max_ce_len);
 
 bool acl_peer_supports_ble_packet_extension(uint16_t hci_handle);
 bool acl_peer_supports_ble_2m_phy(uint16_t hci_handle);
diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h
index 7c312718bc..54049f753c 100644
--- a/system/stack/include/hcimsgs.h
+++ b/system/stack/include/hcimsgs.h
@@ -327,12 +327,6 @@ void btsnd_hcic_ble_set_scan_enable(uint8_t scan_enable, uint8_t duplicate);
 
 void btsnd_hcic_ble_read_acceptlist_size(void);
 
-void btsnd_hcic_ble_upd_ll_conn_params(uint16_t handle, uint16_t conn_int_min,
-                                       uint16_t conn_int_max,
-                                       uint16_t conn_latency,
-                                       uint16_t conn_timeout, uint16_t min_len,
-                                       uint16_t max_len);
-
 void btsnd_hcic_ble_read_remote_feat(uint16_t handle);
 
 void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb);
diff --git a/system/stack/l2cap/l2c_ble_conn_params.cc b/system/stack/l2cap/l2c_ble_conn_params.cc
index ec9a988402..97b7744fa2 100644
--- a/system/stack/l2cap/l2c_ble_conn_params.cc
+++ b/system/stack/l2cap/l2c_ble_conn_params.cc
@@ -244,9 +244,9 @@ void l2cble_start_conn_update(tL2C_LCB* p_lcb) {
                ->SupportsBleConnectionParametersRequest() &&
            acl_peer_supports_ble_connection_parameters_request(
                p_lcb->remote_bd_addr))) {
-        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), min_conn_int,
-                                          max_conn_int, peripheral_latency,
-                                          supervision_tout, 0, 0);
+        acl_ble_connection_parameters_request(p_lcb->Handle(), min_conn_int,
+                                              max_conn_int, peripheral_latency,
+                                              supervision_tout, 0, 0);
         p_lcb->conn_update_mask |= L2C_BLE_UPDATE_PENDING;
       } else {
         l2cu_send_peer_ble_par_req(p_lcb, min_conn_int, max_conn_int,
@@ -264,10 +264,10 @@ void l2cble_start_conn_update(tL2C_LCB* p_lcb) {
                ->SupportsBleConnectionParametersRequest() &&
            acl_peer_supports_ble_connection_parameters_request(
                p_lcb->remote_bd_addr))) {
-        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), p_lcb->min_interval,
-                                          p_lcb->max_interval, p_lcb->latency,
-                                          p_lcb->timeout, p_lcb->min_ce_len,
-                                          p_lcb->max_ce_len);
+        acl_ble_connection_parameters_request(
+            p_lcb->Handle(), p_lcb->min_interval, p_lcb->max_interval,
+            p_lcb->latency, p_lcb->timeout, p_lcb->min_ce_len,
+            p_lcb->max_ce_len);
         p_lcb->conn_update_mask |= L2C_BLE_UPDATE_PENDING;
       } else {
         l2cu_send_peer_ble_par_req(p_lcb, p_lcb->min_interval,
@@ -384,7 +384,7 @@ void l2cble_use_preferred_conn_params(const RawAddress& bda) {
     p_lcb->timeout = p_dev_rec->conn_params.supervision_tout;
     p_lcb->latency = p_dev_rec->conn_params.peripheral_latency;
 
-    btsnd_hcic_ble_upd_ll_conn_params(
+    acl_ble_connection_parameters_request(
         p_lcb->Handle(), p_dev_rec->conn_params.min_conn_int,
         p_dev_rec->conn_params.max_conn_int,
         p_dev_rec->conn_params.peripheral_latency,
diff --git a/system/test/mock/mock_main_shim_acl.cc b/system/test/mock/mock_main_shim_acl.cc
index 218f9cfc45..e8d5677679 100644
--- a/system/test/mock/mock_main_shim_acl.cc
+++ b/system/test/mock/mock_main_shim_acl.cc
@@ -244,3 +244,13 @@ void shim::legacy::Acl::ClearAddressResolution() {
 void shim::legacy::Acl::SetSystemSuspendState(bool /* suspended */) {
   inc_func_call_count(__func__);
 }
+
+void shim::legacy::Acl::UpdateConnectionParameters(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 */,
+                                                   uint16_t /* max_ce_len */) {
+  inc_func_call_count(__func__);
+}
diff --git a/system/test/mock/mock_main_shim_acl_api.cc b/system/test/mock/mock_main_shim_acl_api.cc
index a0d1dcf3e2..6250b8dad6 100644
--- a/system/test/mock/mock_main_shim_acl_api.cc
+++ b/system/test/mock/mock_main_shim_acl_api.cc
@@ -110,3 +110,11 @@ void bluetooth::shim::ACL_LeSubrateRequest(uint16_t /* hci_handle */,
 }
 
 void bluetooth::shim::ACL_Shutdown() { inc_func_call_count(__func__); }
+
+void bluetooth::shim::ACL_SendConnectionParameterUpdateRequest(
+    uint16_t /* hci_handle */, uint16_t /* conn_int_min */,
+    uint16_t /* conn_int_max */, uint16_t /* conn_latency */,
+    uint16_t /* conn_timeout */, uint16_t /* min_ce_len */,
+    uint16_t /* max_ce_len */) {
+  inc_func_call_count(__func__);
+}
diff --git a/system/test/mock/mock_main_shim_acl_api.h b/system/test/mock/mock_main_shim_acl_api.h
index 7782784404..aee9dcdd05 100644
--- a/system/test/mock/mock_main_shim_acl_api.h
+++ b/system/test/mock/mock_main_shim_acl_api.h
@@ -275,6 +275,33 @@ struct ACL_Flush {
 };
 extern struct ACL_Flush ACL_Flush;
 
+// Name: ACL_SendConnectionParameterUpdateRequest
+// Params: uint16_t handle
+// Params: uint16_t conn_int_min
+// Params: uint16_t conn_int_max
+// Params: uint16_t conn_latency
+// Params: uint16_t conn_timeout
+// Params: uint16_t min_ce_len
+// Params: uint16_t max_ce_len
+// Return: void
+struct ACL_SendConnectionParameterUpdateRequest {
+  std::function<void(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,
+                     uint16_t max_ce_len)>
+      body{[](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 */,
+              uint16_t /* max_ce_len */) {}};
+  void operator()(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, uint16_t max_ce_len) {
+    body(handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
+         min_ce_len, max_ce_len);
+  };
+};
+extern struct ACL_SendConnectionParameterUpdateRequest
+    ACL_SendConnectionParameterUpdateRequest;
 }  // namespace main_shim_acl_api
 }  // namespace mock
 }  // namespace test
diff --git a/system/test/mock/mock_stack_acl.cc b/system/test/mock/mock_stack_acl.cc
index a9f0003d5d..300a8ee30c 100644
--- a/system/test/mock/mock_stack_acl.cc
+++ b/system/test/mock/mock_stack_acl.cc
@@ -59,6 +59,8 @@ struct acl_peer_supports_ble_coded_phy acl_peer_supports_ble_coded_phy;
 struct acl_send_data_packet_br_edr acl_send_data_packet_br_edr;
 struct acl_peer_supports_ble_connection_parameters_request
     acl_peer_supports_ble_connection_parameters_request;
+struct acl_ble_connection_parameters_request
+    acl_ble_connection_parameters_request;
 struct acl_peer_supports_ble_packet_extension
     acl_peer_supports_ble_packet_extension;
 struct acl_peer_supports_sniff_subrating acl_peer_supports_sniff_subrating;
@@ -246,6 +248,15 @@ bool acl_peer_supports_ble_connection_parameters_request(
   return test::mock::stack_acl::
       acl_peer_supports_ble_connection_parameters_request(remote_bda);
 }
+void acl_ble_connection_parameters_request(
+    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,
+    uint16_t max_ce_len) {
+  inc_func_call_count(__func__);
+  test::mock::stack_acl::acl_ble_connection_parameters_request(
+      handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
+      min_ce_len, max_ce_len);
+}
 bool acl_peer_supports_ble_packet_extension(uint16_t hci_handle) {
   inc_func_call_count(__func__);
   return test::mock::stack_acl::acl_peer_supports_ble_packet_extension(
diff --git a/system/test/mock/mock_stack_acl.h b/system/test/mock/mock_stack_acl.h
index df3e1f7a37..f02d765178 100644
--- a/system/test/mock/mock_stack_acl.h
+++ b/system/test/mock/mock_stack_acl.h
@@ -234,6 +234,27 @@ struct acl_peer_supports_ble_connection_parameters_request {
 };
 extern struct acl_peer_supports_ble_connection_parameters_request
     acl_peer_supports_ble_connection_parameters_request;
+// Name: acl_peer_supports_ble_connection_parameters_request
+// Params:  const RawAddress& remote_bda
+// Returns: bool
+struct acl_ble_connection_parameters_request {
+  std::function<void(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,
+                     uint16_t max_ce_len)>
+      body{[](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 */,
+              uint16_t /* max_ce_len */) {}};
+  void operator()(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, uint16_t max_ce_len) {
+    body(handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
+         min_ce_len, max_ce_len);
+  };
+};
+extern struct acl_ble_connection_parameters_request
+    acl_ble_connection_parameters_request;
 // Name: acl_peer_supports_ble_packet_extension
 // Params: uint16_t hci_handle
 // Returns: bool
diff --git a/system/test/mock/mock_stack_hcic_hciblecmds.cc b/system/test/mock/mock_stack_hcic_hciblecmds.cc
index 8d7097f27b..5b345a2dad 100644
--- a/system/test/mock/mock_stack_hcic_hciblecmds.cc
+++ b/system/test/mock/mock_stack_hcic_hciblecmds.cc
@@ -85,7 +85,6 @@ struct btsnd_hcic_ble_set_scan_params btsnd_hcic_ble_set_scan_params;
 struct btsnd_hcic_ble_start_enc btsnd_hcic_ble_start_enc;
 struct btsnd_hcic_ble_test_end btsnd_hcic_ble_test_end;
 struct btsnd_hcic_ble_transmitter_test btsnd_hcic_ble_transmitter_test;
-struct btsnd_hcic_ble_upd_ll_conn_params btsnd_hcic_ble_upd_ll_conn_params;
 struct btsnd_hcic_ble_write_adv_params btsnd_hcic_ble_write_adv_params;
 struct btsnd_hcic_create_big btsnd_hcic_create_big;
 struct btsnd_hcic_create_cis btsnd_hcic_create_cis;
@@ -329,17 +328,6 @@ void btsnd_hcic_ble_transmitter_test(uint8_t tx_freq, uint8_t test_data_len,
   test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_transmitter_test(
       tx_freq, test_data_len, payload);
 }
-void btsnd_hcic_ble_upd_ll_conn_params(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,
-                                       uint16_t max_ce_len) {
-  inc_func_call_count(__func__);
-  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_upd_ll_conn_params(
-      handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
-      min_ce_len, max_ce_len);
-}
 void btsnd_hcic_ble_write_adv_params(uint16_t adv_int_min, uint16_t adv_int_max,
                                      uint8_t adv_type,
                                      tBLE_ADDR_TYPE addr_type_own,
diff --git a/system/test/mock/mock_stack_hcic_hciblecmds.h b/system/test/mock/mock_stack_hcic_hciblecmds.h
index ef68736388..b72a427139 100644
--- a/system/test/mock/mock_stack_hcic_hciblecmds.h
+++ b/system/test/mock/mock_stack_hcic_hciblecmds.h
@@ -571,29 +571,6 @@ struct btsnd_hcic_ble_transmitter_test {
 };
 extern struct btsnd_hcic_ble_transmitter_test btsnd_hcic_ble_transmitter_test;
 
-// Name: btsnd_hcic_ble_upd_ll_conn_params
-// Params: 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, uint16_t
-// max_ce_len Return: void
-struct btsnd_hcic_ble_upd_ll_conn_params {
-  std::function<void(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,
-                     uint16_t max_ce_len)>
-      body{[](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 */,
-              uint16_t /* max_ce_len */) {}};
-  void operator()(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, uint16_t max_ce_len) {
-    body(handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,
-         min_ce_len, max_ce_len);
-  };
-};
-extern struct btsnd_hcic_ble_upd_ll_conn_params
-    btsnd_hcic_ble_upd_ll_conn_params;
-
 // Name: btsnd_hcic_ble_write_adv_params
 // Params: uint16_t adv_int_min, uint16_t adv_int_max, uint8_t adv_type,
 // tBLE_ADDR_TYPE addr_type_own, tBLE_ADDR_TYPE addr_type_dir, const RawAddress&