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

Commit ee92e7ae authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 9b8bf69c

Change-Id: Id154ad51546e2a208a9d14c02509581a3b5698a6
parents daea8747 9b8bf69c
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -203,15 +203,15 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass):
            # Send ACL Data
            self.device_under_test.hal.SendHciAcl(
                hal_facade_pb2.HciAclPacket(
                    payload=b'\xfe\x0e\x0b\x00SomeAclData'))
                    payload=b'\xfe\x2e\x0b\x00SomeAclData'))
            # Send ACL Data
            self.cert_device.hal.SendHciAcl(
                hal_facade_pb2.HciAclPacket(
                    payload=b'\xfe\x0e\x0f\x00SomeMoreAclData'))
                    payload=b'\xfe\x2e\x0f\x00SomeMoreAclData'))
            cert_acl_data_asserts.assert_event_occurs(
                lambda packet: b'\xfe\x0e\x0b\x00SomeAclData' in packet.payload)
                lambda packet: b'\xfe\x2e\x0b\x00SomeAclData' in packet.payload)
            acl_data_asserts.assert_event_occurs(
                lambda packet: b'\xfe\x0e\x0f\x00SomeMoreAclData' in packet.payload
                lambda packet: b'\xfe\x2e\x0f\x00SomeMoreAclData' in packet.payload
            )

    def test_le_white_list_connection_cert_advertises(self):
+3 −1
Original line number Diff line number Diff line
@@ -139,9 +139,11 @@ ErrorCode LinkLayerController::SendAclToRemote(
      std::make_unique<bluetooth::packet::RawBuilder>();
  std::vector<uint8_t> payload_bytes(acl_payload.begin(), acl_payload.end());

  constexpr auto pb_flag_controller_to_host =
      bluetooth::hci::PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;
  uint16_t first_two_bytes =
      static_cast<uint16_t>(acl_packet.GetHandle()) +
      (static_cast<uint16_t>(acl_packet.GetPacketBoundaryFlag()) << 12) +
      (static_cast<uint16_t>(pb_flag_controller_to_host) << 12) +
      (static_cast<uint16_t>(acl_packet.GetBroadcastFlag()) << 14);
  raw_builder_ptr->AddOctets2(first_two_bytes);
  raw_builder_ptr->AddOctets2(static_cast<uint16_t>(payload_bytes.size()));