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

Commit 80935c6c authored by Chris Manton's avatar Chris Manton
Browse files

Use proper types gd/l2cap/internal/ 

Bug: 188297862
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Icfc98e930e45412878b140dbb7a1ff103e0e0074
parent 128ac5ca

system/gd/l2cap/internal/enhanced_retransmission_mode_channel_data_controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ void ErtmController::OnSdu(std::unique_ptr<packet::BasePacketBuilder> sdu) { 
    return;

  }

  pimpl_->data_request(SegmentationAndReassembly::START, std::move(segments[0]), sdu_size);

  for (auto i = 1; i < segments.size() - 1; i++) {

  for (size_t i = 1; i < segments.size() - 1; i++) {

    pimpl_->data_request(SegmentationAndReassembly::CONTINUATION, std::move(segments[i]));

  }

  pimpl_->data_request(SegmentationAndReassembly::END, std::move(segments.back()));

system/gd/l2cap/internal/le_credit_based_channel_data_controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void LeCreditBasedDataController::OnSdu(std::unique_ptr<packet::BasePacketBuilde 
  std::unique_ptr<BasicFrameBuilder> builder;

  builder = FirstLeInformationFrameBuilder::Create(remote_cid_, sdu_size, std::move(segments[0]));

  pdu_queue_.emplace(std::move(builder));

  for (auto i = 1; i < segments.size(); i++) {

  for (size_t i = 1; i < segments.size(); i++) {

    builder = BasicFrameBuilder::Create(remote_cid_, std::move(segments[i]));

    pdu_queue_.emplace(std::move(builder));

  }

system/gd/l2cap/internal/scheduler_fifo.cc

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void Fifo::SetChannelTxPriority(Cid cid, bool high_priority) { 
}



void Fifo::RemoveChannel(Cid cid) {

  for (int i = 0; i < next_to_dequeue_and_num_packets.size(); i++) {

  for (size_t i = 0; i < next_to_dequeue_and_num_packets.size(); i++) {

    auto& channel_id_and_number_packets = next_to_dequeue_and_num_packets.front();

    if (channel_id_and_number_packets.second != cid) {

      next_to_dequeue_and_num_packets.push(channel_id_and_number_packets);