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

Commit 5b799786 authored by Myles Watson's avatar Myles Watson
Browse files

Remove HandleNumComplDataPkts only used in tests 

Bug: 283254594
Test: mma -j32
Flag: EXEMPT, test-only changes
Change-Id: I9c44c4122b8da6276d7630d95cab82e2fea7c287
parent 42967d08

system/bta/le_audio/mock_iso_manager.cc

+2 −4
Original line number Diff line number Diff line
@@ -121,13 +121,11 @@ void IsoManager::HandleDisconnect(uint16_t handle, uint8_t reason) { 
  pimpl_->HandleDisconnect(handle, reason);

}



void IsoManager::HandleNumComplDataPkts(uint8_t* p, uint8_t evt_len) {

void IsoManager::HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits) {

  if (!pimpl_) return;

  pimpl_->HandleNumComplDataPkts(p, evt_len);

  pimpl_->HandleGdNumComplDataPkts(handle, credits);

}



void IsoManager::HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits) {}



void IsoManager::HandleHciEvent(uint8_t sub_code, uint8_t* params,

                                uint16_t length) {

  if (!pimpl_) return;

system/bta/le_audio/mock_iso_manager.h

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct MockIsoManager { 
  MOCK_METHOD((void), TerminateBig, (uint8_t big_id, uint8_t reason));

  MOCK_METHOD((void), HandleIsoData, (void* p_msg));

  MOCK_METHOD((void), HandleDisconnect, (uint16_t handle, uint8_t reason));

  MOCK_METHOD((void), HandleNumComplDataPkts, (uint8_t * p, uint8_t evt_len));

  MOCK_METHOD((void), HandleGdNumComplDataPkts, (uint8_t * p, uint8_t evt_len));

  MOCK_METHOD((void), HandleGdNumComplDataPkts,

              (uint16_t handle, uint16_t credits));

  MOCK_METHOD((void), HandleHciEvent,

              (uint8_t sub_code, uint8_t* params, uint16_t length));

system/stack/btm/btm_iso.cc

+0 −5
Original line number Diff line number Diff line
@@ -126,11 +126,6 @@ void IsoManager::HandleDisconnect(uint16_t handle, uint8_t reason) { 
    pimpl_->iso_impl_->disconnection_complete(handle, reason);

}



void IsoManager::HandleNumComplDataPkts(uint8_t* p, uint8_t evt_len) {

  if (pimpl_->IsRunning())

    pimpl_->iso_impl_->handle_num_completed_pkts(p, evt_len);

}



void IsoManager::HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits) {

  if (pimpl_->IsRunning())

    pimpl_->iso_impl_->handle_gd_num_completed_pkts(handle, credits);

system/stack/btm/btm_iso_impl.h

+0 −29
Original line number Diff line number Diff line
@@ -657,35 +657,6 @@ struct iso_impl { 
    }

  }



  void handle_num_completed_pkts(uint8_t* p, uint8_t evt_len) {

    uint8_t num_handles;



    STREAM_TO_UINT8(num_handles, p);



    LOG_ASSERT(evt_len == num_handles * 4 + 1);



    for (int i = 0; i < num_handles; i++) {

      uint16_t handle, num_sent;



      STREAM_TO_UINT16(handle, p);

      STREAM_TO_UINT16(num_sent, p);



      auto iter = conn_hdl_to_cis_map_.find(handle);

      if (iter != conn_hdl_to_cis_map_.end()) {

        iter->second->used_credits -= num_sent;

        iso_credits_ += num_sent;

        continue;

      }



      iter = conn_hdl_to_bis_map_.find(handle);

      if (iter != conn_hdl_to_bis_map_.end()) {

        iter->second->used_credits -= num_sent;

        iso_credits_ += num_sent;

        continue;

      }

    }

  }



  void handle_gd_num_completed_pkts(uint16_t handle, uint16_t credits) {

    auto iter = conn_hdl_to_cis_map_.find(handle);

    if (iter != conn_hdl_to_cis_map_.end()) {

system/stack/include/btm_iso_api.h

+3 −5
Original line number Diff line number Diff line
@@ -211,13 +211,11 @@ class IsoManager { 
  virtual void HandleDisconnect(uint16_t conn_handle, uint8_t reason);



  /**

   * Handles HCI event for the number of completed packets

   * Handles the number of completed packets

   *

   * @param p raw packet buffer for the event. The ownership of p is not being

   * transferred.

   * @param evt_len event packet buffer length

   * @param handle - the handle for which there are completed packets

   * @param credits - the number of packets completed

   */

  virtual void HandleNumComplDataPkts(uint8_t* p, uint8_t evt_len);

  virtual void HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits);



  /**