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

Commit a3e96e62 authored by Myles Watson's avatar Myles Watson
Browse files

HCI: Spell COMPLETE_ADVERTISEMENT

Bug: 148096951
Test: ./run/cert_facade_only.sh
Change-Id: I30a4ed0b6f71a4a546aae95fff39de97da262c6c
parent 9fe8c849
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass):
            self.send_cert_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]))
            enabled_set = hci_packets.EnabledSet()
@@ -282,7 +282,7 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass):
            self.send_dut_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]))

@@ -293,7 +293,7 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass):
            self.send_dut_hci_command(
                hci_packets.LeSetExtendedAdvertisingScanResponseBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_short_name]))

@@ -402,7 +402,7 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass):
            self.send_cert_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]))
            enabled_set = hci_packets.EnabledSet()
+5 −5
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass):
            self.send_hal_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]))

@@ -209,7 +209,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass):
            self.send_hal_hci_command(
                hci_packets.LeSetExtendedAdvertisingScanResponseBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_short_name]))

@@ -297,7 +297,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass):
            self.enqueue_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]), True)

@@ -308,7 +308,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass):
            self.enqueue_hci_command(
                hci_packets.LeSetExtendedAdvertisingScanResponseBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_short_name]), True)

@@ -444,7 +444,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass):
            self.send_hal_hci_command(
                hci_packets.LeSetExtendedAdvertisingDataBuilder(
                    advertising_handle,
                    hci_packets.Operation.COMPLETE_ADVERTISMENT,
                    hci_packets.Operation.COMPLETE_ADVERTISEMENT,
                    hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT,
                    [gap_name]))
            enabled_set = hci_packets.EnabledSet()
+1 −1
Original line number Diff line number Diff line
@@ -2820,7 +2820,7 @@ enum Operation : 3 {
  INTERMEDIATE_FRAGMENT = 0,
  FIRST_FRAGMENT = 1,
  LAST_FRAGMENT = 2,
  COMPLETE_ADVERTISMENT = 3,
  COMPLETE_ADVERTISEMENT = 3,
  UNCHANGED_DATA = 4,
}

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ TEST(HciPacketsTest, testLeSetExtendedAdvertisingData) {
      LeAdvertisingCommandView::Create(CommandPacketView::Create(packet_bytes_view)));
  ASSERT_TRUE(view.IsValid());
  ASSERT_EQ(0, view.GetAdvertisingHandle());
  ASSERT_EQ(Operation::COMPLETE_ADVERTISMENT, view.GetOperation());
  ASSERT_EQ(Operation::COMPLETE_ADVERTISEMENT, view.GetOperation());
  ASSERT_EQ(FragmentPreference::CONTROLLER_SHOULD_NOT, view.GetFragmentPreference());
  std::vector<uint8_t> advertising_data{
      0x02, 0x01, 0x02, 0x0a, 0x09, 0x50, 0x69, 0x78, 0x65, 0x6c, 0x20, 0x33, 0x20, 0x58,
+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ ExtendedAdvertisingConfig::ExtendedAdvertisingConfig(const AdvertisingConfig& co
    own_address_type = OwnAddressType::RANDOM_DEVICE_ADDRESS;
  }
  // TODO(b/149221472): Support fragmentation
  operation = Operation::COMPLETE_ADVERTISMENT;
  operation = Operation::COMPLETE_ADVERTISEMENT;
}

struct LeAdvertisingManager::impl {