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

Commit 4884071f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cert: Add scan data" am: 19493630 am: 1279ca84 am: a9ec13a6 am:... 

Merge "Cert: Add scan data" am: 19493630 am: 1279ca84 am: a9ec13a6 am: 1c728f21 am: 5b267962

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

Change-Id: I15c32a09e844d34913f8f7d1109e8defba252854
parents 477b552b 5b267962

system/gd/hci/cert/le_scanning_manager_test_lib.py

+5 −1
Original line number Diff line number Diff line
@@ -95,9 +95,13 @@ class LeScanningManagerTestBase(): 
        gap_name.data_type = hci_packets.GapDataType.COMPLETE_LOCAL_NAME

        gap_name.data = list(bytes(b'Im_The_CERT!'))

        gap_data = le_advertising_facade.GapDataMsg(data=bytes(gap_name.Serialize()))

        gap_scan_name = hci_packets.GapData()

        gap_scan_name.data_type = hci_packets.GapDataType.SHORTENED_LOCAL_NAME

        gap_scan_name.data = list(bytes(b'CERT!'))

        gap_scan_data = le_advertising_facade.GapDataMsg(data=bytes(gap_scan_name.Serialize()))

        config = le_advertising_facade.AdvertisingConfig(

            advertisement=[gap_data],

            scan_response=[gap_data],

            scan_response=[gap_scan_data],

            interval_min=512,

            interval_max=768,

            advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

system/gd/hci/cert/le_scanning_with_security_test_lib.py

+5 −0
Original line number Diff line number Diff line
@@ -66,8 +66,13 @@ class LeScanningWithSecurityTestBase(): 
            gap_name.data_type = hci_packets.GapDataType.COMPLETE_LOCAL_NAME

            gap_name.data = list(bytes(b'Im_The_CERT!'))

            gap_data = le_advertising_facade.GapDataMsg(data=bytes(gap_name.Serialize()))

            gap_scan_name = hci_packets.GapData()

            gap_scan_name.data_type = hci_packets.GapDataType.SHORTENED_LOCAL_NAME

            gap_scan_name.data = list(bytes(b'CERT!'))

            gap_scan_data = le_advertising_facade.GapDataMsg(data=bytes(gap_scan_name.Serialize()))

            config = le_advertising_facade.AdvertisingConfig(

                advertisement=[gap_data],

                scan_response=[gap_scan_data],

                interval_min=512,

                interval_max=768,

                advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,