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

Commit 5f164002 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Fix tidy build breakage" am: 5650f5cc 

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



Change-Id: I23ba241b63d67310f9b05bfce9fe54d955a7ba59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96534a5f 5650f5cc

tools/rootcanal/include/hci/pcap_filter.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -49,9 +49,6 @@ class PcapFilter final { 




  std::vector<uint8_t> FilterHciCommand(std::vector<uint8_t> const& packet);

  std::vector<uint8_t> FilterHciCommand(std::vector<uint8_t> const& packet);

  std::vector<uint8_t> FilterHciEvent(std::vector<uint8_t> const& packet);

  std::vector<uint8_t> FilterHciEvent(std::vector<uint8_t> const& packet);

  std::vector<uint8_t> FilterHciAcl(std::vector<uint8_t> const& packet) const;

  std::vector<uint8_t> FilterHciSco(std::vector<uint8_t> const& packet) const;

  std::vector<uint8_t> FilterHciIso(std::vector<uint8_t> const& packet) const;





 private:

 private:

  // Specific filters for HCI commands.

  // Specific filters for HCI commands.

tools/rootcanal/lib/hci/pcap_filter.cc

+7 −6
Original line number Original line Diff line number Diff line
@@ -34,6 +34,10 @@ static PacketView<kLittleEndian> create_packet_view( 
      &packet, [](std::vector<uint8_t> const* /* ptr */) {}));

      &packet, [](std::vector<uint8_t> const* /* ptr */) {}));

}

}





static std::vector<uint8_t> FilterHciAcl(std::vector<uint8_t> const& packet);

static std::vector<uint8_t> FilterHciSco(std::vector<uint8_t> const& packet);

static std::vector<uint8_t> FilterHciIso(std::vector<uint8_t> const& packet);



std::vector<uint8_t> PcapFilter::FilterHciPacket(

std::vector<uint8_t> PcapFilter::FilterHciPacket(

    std::vector<uint8_t> const& packet, uint8_t idc) {

    std::vector<uint8_t> const& packet, uint8_t idc) {

  switch (idc) {

  switch (idc) {
@@ -133,8 +137,7 @@ std::vector<uint8_t> PcapFilter::FilterHciEvent( 
  return std::vector<uint8_t>(packet);

  return std::vector<uint8_t>(packet);

}

}





std::vector<uint8_t> PcapFilter::FilterHciAcl(

static std::vector<uint8_t> FilterHciAcl(std::vector<uint8_t> const& packet) {

    std::vector<uint8_t> const& packet) const {

  auto acl = AclView::Create(create_packet_view(packet));

  auto acl = AclView::Create(create_packet_view(packet));

  std::vector<uint8_t> payload;

  std::vector<uint8_t> payload;

  payload.resize(acl.GetPayload().size());

  payload.resize(acl.GetPayload().size());
@@ -145,8 +148,7 @@ std::vector<uint8_t> PcapFilter::FilterHciAcl( 
      ->SerializeToBytes();

      ->SerializeToBytes();

}

}





std::vector<uint8_t> PcapFilter::FilterHciSco(

static std::vector<uint8_t> FilterHciSco(std::vector<uint8_t> const& packet) {

    std::vector<uint8_t> const& packet) const {

  auto sco = ScoView::Create(create_packet_view(packet));

  auto sco = ScoView::Create(create_packet_view(packet));

  std::vector<uint8_t> data;

  std::vector<uint8_t> data;

  data.resize(sco.GetData().size());

  data.resize(sco.GetData().size());
@@ -155,8 +157,7 @@ std::vector<uint8_t> PcapFilter::FilterHciSco( 
      ->SerializeToBytes();

      ->SerializeToBytes();

}

}





std::vector<uint8_t> PcapFilter::FilterHciIso(

static std::vector<uint8_t> FilterHciIso(std::vector<uint8_t> const& packet) {

    std::vector<uint8_t> const& packet) const {

  auto iso = IsoView::Create(create_packet_view(packet));

  auto iso = IsoView::Create(create_packet_view(packet));

  std::vector<uint8_t> payload;

  std::vector<uint8_t> payload;

  payload.resize(iso.GetPayload().size());

  payload.resize(iso.GetPayload().size());