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

Commit 1122cbe4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes I5acd7ba9,If41d86e9,I4cea9ed3,I30a4ed0b am: c2001475 

Change-Id: If33300b8aee17128cfc5daad3422588eb72f094f
parents a1ec6543 c2001475

system/gd/cert/run_cert_facade_only.sh

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ if [[ -z "${ANDROID_HOST_OUT}" ]]; then 
  echo "ANDROID_HOST_OUT is not set for host run"

fi



unzip -u $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py.zip -d $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py

unzip -o -q $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py.zip -d $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py



PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py python3.8 `which act.py` -c $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/host_only_config_facade_only.json -tf $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/cert_testcases_facade_only -tp $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd

system/gd/hal/cert/simple_hal_test.py

+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()

system/gd/hci/cert/direct_hci_test.py

+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()

system/gd/hci/cert/le_acl_manager_test.py

0 → 100644
+422 −0

File added.

Preview size limit exceeded, changes collapsed.

system/gd/hci/cert/le_advertising_manager_test.py

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.