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

Commit f1995e61 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "gd: Set address policy for advertising cert test"

parents 0e11823b 7efb0c53

system/gd/hci/cert/le_advertising_manager_test_lib.py

+11 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ from facade import rootservice_pb2 as facade_rootservice 
from hci.facade import hci_facade_pb2 as hci_facade

from hci.facade import hci_facade_pb2 as hci_facade

from hci.facade import \

from hci.facade import \

  le_advertising_manager_facade_pb2 as le_advertising_facade

  le_advertising_manager_facade_pb2 as le_advertising_facade

from hci.facade import le_initiator_address_facade_pb2 as le_initiator_address_facade

from bluetooth_packets_python3 import hci_packets

from bluetooth_packets_python3 import hci_packets

from facade import common_pb2 as common

from facade import common_pb2 as common

from cert.py_hci import PyHci

from cert.py_hci import PyHci
@@ -39,6 +40,16 @@ class LeAdvertisingManagerTestBase(): 
        self.cert_hci.close()

        self.cert_hci.close()





    def test_le_ad_scan_dut_advertises(self):

    def test_le_ad_scan_dut_advertises(self):

        privacy_policy = le_initiator_address_facade.PrivacyPolicy(

            address_policy=le_initiator_address_facade.AddressPolicy.USE_STATIC_ADDRESS,

            address_with_type=common.BluetoothAddressWithType(

                address=common.BluetoothAddress(address=bytes(b'D0:05:04:03:02:01')),

                type=common.RANDOM_DEVICE_ADDRESS),

            rotation_irk=b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',

            minimum_rotation_time=0,

            maximum_rotation_time=0)

        self.dut.hci_le_initiator_address.SetPrivacyPolicyForInitiatorAddress(privacy_policy)



        self.cert_hci.register_for_le_events(hci_packets.SubeventCode.ADVERTISING_REPORT,

        self.cert_hci.register_for_le_events(hci_packets.SubeventCode.ADVERTISING_REPORT,

                                             hci_packets.SubeventCode.EXTENDED_ADVERTISING_REPORT)

                                             hci_packets.SubeventCode.EXTENDED_ADVERTISING_REPORT)

system/gd/hci/le_address_manager.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ class LeAddressManager { 
  void AckResume(LeAddressManagerCallback* callback);

  void AckResume(LeAddressManagerCallback* callback);

  virtual AddressPolicy Register(LeAddressManagerCallback* callback);

  virtual AddressPolicy Register(LeAddressManagerCallback* callback);

  virtual void Unregister(LeAddressManagerCallback* callback);

  virtual void Unregister(LeAddressManagerCallback* callback);

  AddressWithType GetCurrentAddress();          // What was set in SetRandomAddress()

  virtual AddressWithType GetCurrentAddress();  // What was set in SetRandomAddress()

  virtual AddressWithType GetAnotherAddress();  // A new random address without rotating.

  virtual AddressWithType GetAnotherAddress();  // A new random address without rotating.





  uint8_t GetConnectListSize();

  uint8_t GetConnectListSize();

system/gd/hci/le_advertising_manager_test.cc

+7 −0
Original line number Original line Diff line number Diff line
@@ -251,6 +251,13 @@ class TestLeAddressManager : public LeAddressManager { 
    auto random_address = AddressWithType(address, AddressType::RANDOM_DEVICE_ADDRESS);

    auto random_address = AddressWithType(address, AddressType::RANDOM_DEVICE_ADDRESS);

    return random_address;

    return random_address;

  }

  }



  AddressWithType GetCurrentAddress() override {

    hci::Address address;

    Address::FromString("05:04:03:02:01:00", address);

    auto random_address = AddressWithType(address, AddressType::RANDOM_DEVICE_ADDRESS);

    return random_address;

  }

};

};





class TestAclManager : public AclManager {

class TestAclManager : public AclManager {