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

Commit 900d0132 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "[GD ACL] Make ACL packets non-flushable by default" am: 185f7a12 am:... 

Merge "[GD ACL] Make ACL packets non-flushable by default" am: 185f7a12 am: 6154a238 am: 152e3947

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1564674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id272759c8dfacea9cc7258f0edaee2d208dc5cb7
parents 5ebf6ff1 152e3947

system/gd/hci/acl_manager/round_robin_scheduler.cc

+2 −3
Original line number Original line Diff line number Diff line
@@ -127,9 +127,8 @@ void RoundRobinScheduler::buffer_packet(std::map<uint16_t, acl_queue_handler>::i 




  ConnectionType connection_type = acl_queue_handler->second.connection_type_;

  ConnectionType connection_type = acl_queue_handler->second.connection_type_;

  size_t mtu = connection_type == ConnectionType::CLASSIC ? hci_mtu_ : le_hci_mtu_;

  size_t mtu = connection_type == ConnectionType::CLASSIC ? hci_mtu_ : le_hci_mtu_;

  PacketBoundaryFlag packet_boundary_flag =

  // TODO(b/178752129): Make A2DP and Hearing Aid audio packets flushable

      (connection_type == ConnectionType::CLASSIC ? PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE

  PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::FIRST_NON_AUTOMATICALLY_FLUSHABLE;

                                                  : PacketBoundaryFlag::FIRST_NON_AUTOMATICALLY_FLUSHABLE);

  int acl_priority = acl_queue_handler->second.high_priority_ ? 1 : 0;

  int acl_priority = acl_queue_handler->second.high_priority_ ? 1 : 0;

  if (packet->size() <= mtu) {

  if (packet->size() <= mtu) {

    fragments_to_send_.push(

    fragments_to_send_.push(