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

Commit a276a0a3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14162270, 14161282, 14163042, 14163907] into sc-release

Change-Id: I23b3f5af2d557f56807915235de3459c69e38008
parents acec7b08 b99eb4e5
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ class HciHalHidl : public HciHal {
  }

  void sendHciCommand(HciPacket command) override {
    common::StopWatch(GetTimerText(__func__, command));
    btsnoop_logger_->Capture(command, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::CMD);
    if (common::init_flags::btaa_hci_is_enabled()) {
      btaa_logger_->Capture(command, SnoopLogger::PacketType::CMD);
@@ -166,7 +165,6 @@ class HciHalHidl : public HciHal {
  }

  void sendAclData(HciPacket packet) override {
    common::StopWatch(GetTimerText(__func__, packet));
    btsnoop_logger_->Capture(packet, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::ACL);
    if (common::init_flags::btaa_hci_is_enabled()) {
      btaa_logger_->Capture(packet, SnoopLogger::PacketType::ACL);
@@ -175,7 +173,6 @@ class HciHalHidl : public HciHal {
  }

  void sendScoData(HciPacket packet) override {
    common::StopWatch(GetTimerText(__func__, packet));
    btsnoop_logger_->Capture(packet, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::SCO);
    if (common::init_flags::btaa_hci_is_enabled()) {
      btaa_logger_->Capture(packet, SnoopLogger::PacketType::SCO);
@@ -189,7 +186,6 @@ class HciHalHidl : public HciHal {
      return;
    }

    common::StopWatch(GetTimerText(__func__, packet));
    btsnoop_logger_->Capture(packet, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::ISO);
    bt_hci_1_1_->sendIsoData(packet);
  }