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

Commit 80c24f63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GD: Add Host test for extended scanning" am: ea27b634 

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

Change-Id: Ie67328777c77eb29a1b71e608c9dace6a5e4bcfc
parents 9eebb74d ea27b634

system/gd/cert/all_cert_testcases

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ SimpleHalTest 
DirectHciTest

LeAdvertisingManagerTest

LeScanningManagerTest

LeExtendedScanningManagerTest

LeScanningWithSecurityTest

NeighborTest

ControllerTest

system/gd/hci/cert/le_extended_config.json

0 → 100644
+6 −0
Original line number Diff line number Diff line 
{

    "supported_commands" : ["b3", "ff", "ef", "01", "ce", "fd", "81", "ff", "3f", "0f",

                            "40", "1e", "f0", "03", "e8", "02", "03", "d6", "81", "9f",

                            "1c", "00", "00", "00", "40", "f7", "ff", "a7", "0f", "20",

                            "00", "00", "4a", "80", "78", "ff", "ff", "ff", "00", "00",],

}

system/gd/hci/cert/le_scanning_manager_test.py

+15 −0
Original line number Diff line number Diff line
@@ -31,3 +31,18 @@ class LeScanningManagerTest(GdBaseTestClass, LeScanningManagerTestBase): 
    def teardown_test(self):

        LeScanningManagerTestBase.teardown_test(self)

        GdBaseTestClass.teardown_test(self)





class LeExtendedScanningManagerTest(GdBaseTestClass, LeScanningManagerTestBase):



    def setup_class(self):

        GdBaseTestClass.setup_class(self, dut_module='HCI_INTERFACES', cert_module='HCI_INTERFACES')



    def setup_test(self):

        GdBaseTestClass.set_controller_properties_path(self, 'hci/cert/le_extended_config.json')

        GdBaseTestClass.setup_test(self)

        LeScanningManagerTestBase.setup_test(self, self.cert)



    def teardown_test(self):

        LeScanningManagerTestBase.teardown_test(self)

        GdBaseTestClass.teardown_test(self)
 
 No newline at end of file

system/gd/hci/cert/le_scanning_manager_test_lib.py

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ class LeScanningManagerTestBase(): 
        gap_data = le_advertising_facade.GapDataMsg(data=bytes(gap_name.Serialize()))

        config = le_advertising_facade.AdvertisingConfig(

            advertisement=[gap_data],

            scan_response=[gap_data],

            interval_min=512,

            interval_max=768,

            advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

system/vendor_libs/test_vendor_lib/model/controller/dual_mode_controller.cc

+7 −0
Original line number Diff line number Diff line
@@ -2383,6 +2383,13 @@ void DualModeController::LeSetExtendedAdvertisingScanResponse( 
  ASSERT(command_view.IsValid());

  properties_.SetLeScanResponse(std::vector<uint8_t>(

      command_view.GetPayload().begin() + 1, command_view.GetPayload().end()));

  auto raw_command_view =

      gd_hci::LeSetExtendedAdvertisingScanResponseRawView::Create(

          gd_hci::LeAdvertisingCommandView::Create(command));

  ASSERT(raw_command_view.IsValid());

  link_layer_controller_.SetLeExtendedScanResponseData(

      command_view.GetAdvertisingHandle(),

      raw_command_view.GetScanResponseData());

  send_event_(

      bluetooth::hci::LeSetExtendedAdvertisingScanResponseCompleteBuilder::

          Create(kNumCommandPackets, ErrorCode::SUCCESS));