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

Commit 48325bb0 authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Automerger Merge Worker
Browse files

Merge "GD: Set non resolvable random address" am: 7d247e5c 

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



Change-Id: Icb56c1c8c6db6fc53c8d6bc956be9825a6163175
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 633fbde4 7d247e5c

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,11 @@ class LeAclManagerTest(gd_base_test.GdBaseTestClass): 
        self.dut.hci_le_initiator_address.SetPrivacyPolicyForInitiatorAddress(privacy_policy)

        self.dut.hci_le_initiator_address.SetPrivacyPolicyForInitiatorAddress(privacy_policy)

        dut_le_acl, cert_le_acl = self.dut_connects()

        dut_le_acl, cert_le_acl = self.dut_connects()





        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.handle).isNotNone()

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

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

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

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

system/gd/hci/le_address_manager.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ void LeAddressManager::SetPrivacyPolicyForInitiatorAddressForTest( 
      minimum_rotation_time_ = minimum_rotation_time;

      minimum_rotation_time_ = minimum_rotation_time;

      maximum_rotation_time_ = maximum_rotation_time;

      maximum_rotation_time_ = maximum_rotation_time;

      address_rotation_alarm_ = std::make_unique<os::Alarm>(handler_);

      address_rotation_alarm_ = std::make_unique<os::Alarm>(handler_);

      set_random_address();

      break;

      break;

    case AddressPolicy::POLICY_NOT_SET:

    case AddressPolicy::POLICY_NOT_SET:

      LOG_ALWAYS_FATAL("invalid parameters");

      LOG_ALWAYS_FATAL("invalid parameters");