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

Commit 8f61ea1f authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "gd: Refactor LE advertising config" am: 6fcb47e8 am: b8d4179b am: d99a5c20 

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

Change-Id: If267d38818b211a5fd2eef92a91607e8d22f9c56
parents 36185ef8 d99a5c20

system/gd/facade/common.proto

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ enum BluetoothAddressTypeEnum { 
  RANDOM_IDENTITY_ADDRESS = 0x3;

}



enum BluetoothOwnAddressTypeEnum {

  USE_PUBLIC_DEVICE_ADDRESS = 0x0;

  USE_RANDOM_DEVICE_ADDRESS = 0x1;

  RESOLVABLE_OR_PUBLIC_ADDRESS = 0x2;

  RESOLVABLE_OR_RANDOM_ADDRESS = 0x3;

}



message BluetoothAddressWithType {

  BluetoothAddress address = 1;

  BluetoothAddressTypeEnum type = 2;

system/gd/hci/cert/le_acl_manager_test.py

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ class LeAclManagerTest(GdBaseTestClass): 
            advertisement=[gap_data],

            interval_min=512,

            interval_max=768,

            event_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

            address_type=common.RANDOM_DEVICE_ADDRESS,

            advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

            own_address_type=common.USE_RANDOM_DEVICE_ADDRESS,

            peer_address_type=common.PUBLIC_DEVICE_OR_IDENTITY_ADDRESS,

            peer_address=common.BluetoothAddress(address=bytes(b'A6:A5:A4:A3:A2:A1')),

            channel_map=7,

system/gd/hci/cert/le_advertising_manager_test.py

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ class LeAdvertisingManagerTest(GdBaseTestClass): 
                advertisement=[gap_data],

                interval_min=512,

                interval_max=768,

                event_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                address_type=common.RANDOM_DEVICE_ADDRESS,

                advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                own_address_type=common.USE_RANDOM_DEVICE_ADDRESS,

                channel_map=7,

                filter_policy=le_advertising_facade.AdvertisingFilterPolicy.ALL_DEVICES)

            request = le_advertising_facade.CreateAdvertiserRequest(config=config)

system/gd/hci/cert/le_scanning_manager_test.py

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ class LeScanningManagerTest(GdBaseTestClass): 
                advertisement=[gap_data],

                interval_min=512,

                interval_max=768,

                event_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                address_type=common.RANDOM_DEVICE_ADDRESS,

                advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                own_address_type=common.USE_RANDOM_DEVICE_ADDRESS,

                channel_map=7,

                filter_policy=le_advertising_facade.AdvertisingFilterPolicy.ALL_DEVICES)

            request = le_advertising_facade.CreateAdvertiserRequest(config=config)

system/gd/hci/cert/le_scanning_with_security_test.py

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ class LeScanningWithSecurityTest(GdBaseTestClass): 
                advertisement=[gap_data],

                interval_min=512,

                interval_max=768,

                event_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                address_type=common.RANDOM_DEVICE_ADDRESS,

                advertising_type=le_advertising_facade.AdvertisingEventType.ADV_IND,

                own_address_type=common.USE_RANDOM_DEVICE_ADDRESS,

                channel_map=7,

                filter_policy=le_advertising_facade.AdvertisingFilterPolicy.ALL_DEVICES)

            request = le_advertising_facade.CreateAdvertiserRequest(config=config)