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

Commit 1da44136 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "shim: Connect le data length change" into tm-dev am: f71c7d1a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18437669



Change-Id: Id21e0a35894f5b3b7aa869d47bed294737b5fd6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed66b4e0 f71c7d1a

system/main/shim/acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -732,10 +732,10 @@ class LeShimAclConnection 
        interface_.on_connection_update, ToLegacyHciErrorCode(hci_status),

        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) {

    TRY_POSTING_ON_MAIN(interface_.on_data_length_change, tx_octets, tx_time,

                        rx_octets, rx_time);

  void OnDataLengthChange(uint16_t max_tx_octets, uint16_t max_tx_time,

                          uint16_t max_rx_octets, uint16_t max_rx_time) {

    TRY_POSTING_ON_MAIN(interface_.on_data_length_change, handle_,

                        max_tx_octets, max_tx_time, max_rx_octets, max_rx_time);

  }



  void OnReadRemoteVersionInformationComplete(hci::ErrorCode hci_status,

system/main/shim/acl_legacy_interface.cc

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ const acl_interface_t GetAclInterface() { 
      .link.classic.on_role_discovery_complete = nullptr,



      .link.le.on_connection_update = acl_ble_update_event_received,

      .link.le.on_data_length_change = nullptr,

      .link.le.on_data_length_change = acl_ble_data_length_change_event,

      .link.le.on_read_remote_version_information_complete =

          btm_read_remote_version_complete,

  };

system/main/shim/acl_legacy_interface.h

+3 −2
Original line number Diff line number Diff line
@@ -116,8 +116,9 @@ typedef struct { 
                               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,

                                uint16_t rx_octets, uint16_t rx_time);

  void (*on_data_length_change)(uint16_t handle, uint16_t max_tx_octets,

                                uint16_t max_tx_time, uint16_t max_rx_octets,

                                uint16_t max_rx_time);

  void (*on_read_remote_version_information_complete)(

      tHCI_STATUS status, uint16_t handle, uint8_t lmp_version,

      uint16_t manufacturer_name, uint16_t sub_version);

system/stack/acl/ble_acl.cc

+11 −0
Original line number Diff line number Diff line
@@ -181,3 +181,14 @@ void acl_ble_update_event_received(tHCI_STATUS status, uint16_t handle, 
  gatt_notify_conn_update(p_dev_rec->ble.pseudo_addr, interval, latency,

                          timeout, status);

}



void acl_ble_data_length_change_event(uint16_t handle, uint16_t max_tx_octets,

                                      uint16_t max_tx_time,

                                      uint16_t max_rx_octets,

                                      uint16_t max_rx_time) {

  LOG_DEBUG(

      "Data length change event received handle:0x%04x max_tx_octets:%hu "

      "max_tx_time:%hu max_rx_octets:%hu max_rx_time:%hu",

      handle, max_tx_octets, max_tx_time, max_rx_octets, max_rx_time);

  l2cble_process_data_length_change_event(handle, max_tx_octets, max_rx_octets);

}

system/stack/include/ble_acl_interface.h

+4 −0
Original line number Diff line number Diff line
@@ -42,3 +42,7 @@ void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type, 
void acl_ble_update_event_received(tHCI_STATUS status, uint16_t handle,

                                   uint16_t interval, uint16_t latency,

                                   uint16_t timeout);

void acl_ble_data_length_change_event(uint16_t handle, uint16_t max_tx_octets,

                                      uint16_t max_tx_time,

                                      uint16_t max_rx_octets,

                                      uint16_t max_rx_time);