Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9cc779c authored by Chris Manton's avatar Chris Manton
Browse files

Wire link_le_on_connection_update into acl shim 

Bug: 171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor

Change-Id: Ieac3be19c960d00725ee0df7e5919f77464ab98c
parent 6091639d

system/main/shim/acl.cc

+4 −2
Original line number Diff line number Diff line
@@ -356,8 +356,10 @@ class LeShimAclConnection 
  void OnConnectionUpdate(uint16_t connection_interval,

                          uint16_t connection_latency,

                          uint16_t supervision_timeout) {

    TRY_POSTING_ON_MAIN(interface_.on_connection_update, connection_interval,

                        connection_latency, supervision_timeout);

    TRY_POSTING_ON_MAIN(interface_.on_connection_update,

                        ToLegacyHciErrorCode(hci::ErrorCode::SUCCESS), handle_,

                        connection_interval, connection_latency,

                        supervision_timeout);

  }

  void OnDataLengthChange(uint16_t tx_octets, uint16_t tx_time,

                          uint16_t rx_octets, uint16_t rx_time) {

system/main/shim/acl_legacy_interface.cc

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ const acl_interface_t GetAclInterface() { 
      .link.classic.on_role_change = btm_acl_role_changed,

      .link.classic.on_role_discovery_complete = nullptr,



      .link.le.on_connection_update = nullptr,

      .link.le.on_connection_update = acl_ble_update_event_received,

      .link.le.on_data_length_change = nullptr,

  };

  return acl_interface;

system/main/shim/acl_legacy_interface.h

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ typedef struct { 
} acl_classic_link_interface_t;



typedef struct {

  void (*on_connection_update)(uint16_t connection_interval,

  void (*on_connection_update)(tHCI_STATUS status, uint16_t handle,

                               uint16_t connection_interval,

                               uint16_t connection_latency,

                               uint16_t supervision_timeout);

  void (*on_data_length_change)(uint16_t tx_octets, uint16_t tx_time,