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

Commit 6caf6051 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes I72e0b382,I674beac1,Ia01fa4c0,Ibcc44694,I5602c516, ... into... 

Merge changes I72e0b382,I674beac1,Ia01fa4c0,Ibcc44694,I5602c516, ... into tm-dev am: 674fa323 am: ed089e1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18513616



Change-Id: I92743830ca95ca074d148d757458e9c00d8de05e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a3dd543 ed089e1d

system/blueberry/tests/gd/hci/le_acl_manager_test.py

+65 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ from blueberry.tests.gd.cert.truth import assertThat 
from blueberry.tests.gd.cert.py_hci import PyHci, PyHciAdvertisement

from blueberry.tests.gd.cert.py_le_acl_manager import PyLeAclManager

from blueberry.facade import common_pb2 as common

from blueberry.facade.hci import le_acl_manager_facade_pb2 as le_acl_manager_facade

from blueberry.facade.hci import le_advertising_manager_facade_pb2 as le_advertising_facade

from blueberry.facade.hci import le_initiator_address_facade_pb2 as le_initiator_address_facade

from blueberry.facade.hci import hci_facade_pb2 as hci_facade
@@ -95,6 +96,46 @@ class LeAclManagerTest(gd_base_test.GdBaseTestClass): 
        cert_le_acl = self.cert_hci.incoming_le_connection()

        return dut_le_acl, cert_le_acl



    def cert_advertises_resolvable(self):

        self.cert_hci.add_device_to_resolving_list(hci_packets.PeerAddressType.PUBLIC_DEVICE_OR_IDENTITY_ADDRESS,

                                                   self.dut_public_address,

                                                   b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f',

                                                   b'\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f')



        # Cert Advertises

        advertising_handle = 0

        py_hci_adv = PyHciAdvertisement(advertising_handle, self.cert_hci)



        self.cert_hci.create_advertisement(

            advertising_handle,

            self.cert_random_address,

            hci_packets.LegacyAdvertisingProperties.ADV_IND,

            own_address_type=hci_packets.OwnAddressType.RESOLVABLE_OR_PUBLIC_ADDRESS,

            peer_address=self.dut_public_address,

            peer_address_type=hci_packets.PeerAddressType.PUBLIC_DEVICE_OR_IDENTITY_ADDRESS)



        py_hci_adv.set_data(b'Im_A_Cert')

        py_hci_adv.set_scan_response(b'Im_A_C')

        py_hci_adv.start()



    def dut_connects_cert_resolvable(self):

        self.dut.hci_le_acl_manager.AddDeviceToResolvingList(

            le_acl_manager_facade.IrkMsg(

                peer=common.BluetoothAddressWithType(

                    address=common.BluetoothAddress(address=bytes(self.cert_public_address, "utf-8")),

                    type=int(hci_packets.AddressType.PUBLIC_DEVICE_ADDRESS)),

                peer_irk=b'\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f',

                local_irk=b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f',

            ))



        dut_le_acl = self.dut_le_acl_manager.connect_to_remote(

            remote_addr=common.BluetoothAddressWithType(

                address=common.BluetoothAddress(address=bytes(self.cert_public_address, "utf-8")),

                type=int(hci_packets.AddressType.PUBLIC_DEVICE_ADDRESS)))



        cert_le_acl = self.cert_hci.incoming_le_connection()

        return dut_le_acl, cert_le_acl



    def send_receive_and_check(self, dut_le_acl, cert_le_acl):

        self.enqueue_acl_data(cert_le_acl.handle, hci_packets.PacketBoundaryFlag.FIRST_NON_AUTOMATICALLY_FLUSHABLE,

                              hci_packets.BroadcastFlag.POINT_TO_POINT,
@@ -128,8 +169,9 @@ class LeAclManagerTest(gd_base_test.GdBaseTestClass): 
        dut_le_acl, cert_le_acl = self.dut_connects()



        assertThat(cert_le_acl.handle).isNotNone()

        assertThat(cert_le_acl.peer).isEqualTo(self.dut_public_address)

        assertThat(cert_le_acl.peer_type).isEqualTo(hci_packets.AddressType.PUBLIC_DEVICE_ADDRESS)

        assertThat(cert_le_acl.peer).isNotEqualTo(self.dut_public_address)

        assertThat(cert_le_acl.peer).isNotEqualTo(self.dut_random_address)

        assertThat(cert_le_acl.peer_type).isEqualTo(hci_packets.AddressType.RANDOM_DEVICE_ADDRESS)



        assertThat(dut_le_acl.handle).isNotNone()

        assertThat(dut_le_acl.remote_address).isEqualTo(self.cert_random_address)
@@ -137,6 +179,27 @@ class LeAclManagerTest(gd_base_test.GdBaseTestClass): 


        self.send_receive_and_check(dut_le_acl, cert_le_acl)



    def test_dut_connects_resolvable_address_public(self):

        privacy_policy = le_initiator_address_facade.PrivacyPolicy(

            address_policy=le_initiator_address_facade.AddressPolicy.USE_RESOLVABLE_ADDRESS,

            rotation_irk=b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f',

            minimum_rotation_time=7 * 60 * 1000,

            maximum_rotation_time=15 * 60 * 1000)

        self.dut.hci_le_initiator_address.SetPrivacyPolicyForInitiatorAddress(privacy_policy)

        self.cert_advertises_resolvable()

        dut_le_acl, cert_le_acl = self.dut_connects_cert_resolvable()



        assertThat(cert_le_acl.handle).isNotNone()

        assertThat(cert_le_acl.peer).isNotEqualTo(self.dut_public_address)

        assertThat(cert_le_acl.peer).isNotEqualTo(self.dut_random_address)

        assertThat(cert_le_acl.peer_type).isEqualTo(hci_packets.AddressType.RANDOM_DEVICE_ADDRESS)



        assertThat(dut_le_acl.handle).isNotNone()

        assertThat(dut_le_acl.remote_address).isEqualTo(self.cert_public_address)

        assertThat(dut_le_acl.remote_address_type).isEqualTo(hci_packets.AddressType.PUBLIC_DEVICE_ADDRESS)



        self.send_receive_and_check(dut_le_acl, cert_le_acl)



    def test_dut_connects_non_resolvable_address(self):

        privacy_policy = le_initiator_address_facade.PrivacyPolicy(

            address_policy=le_initiator_address_facade.AddressPolicy.USE_NON_RESOLVABLE_ADDRESS,