From fe792b22b38df54dfdca98b269f4eea6336c365e Mon Sep 17 00:00:00 2001 From: Chienyuan Date: Fri, 29 Jan 2021 17:55:23 +0800 Subject: [PATCH] gd: Add dependency for Advertising/Scanning/L2CAP module Tag: #gd-refactor Bug: 177044452 Test: gd/cert/run --host Test: manual, set init flag Change-Id: I831d98cc5ed62a37924b7c465283401882b92b89 --- gd/rust/common/src/init_flags.rs | 3 +++ main/shim/le_advertising_manager.cc | 18 ------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/gd/rust/common/src/init_flags.rs b/gd/rust/common/src/init_flags.rs index 458862844..38d277d50 100644 --- a/gd/rust/common/src/init_flags.rs +++ b/gd/rust/common/src/init_flags.rs @@ -91,6 +91,9 @@ init_flags!( dependencies: { gd_core => gd_security, gd_security => gd_acl, + gd_l2cap => gd_scanning, + gd_scanning => gd_advertising, + gd_advertising => gd_acl, gd_acl => gd_controller, gd_controller => gd_hci, gd_link_policy => gd_acl diff --git a/main/shim/le_advertising_manager.cc b/main/shim/le_advertising_manager.cc index b72f8c1cb..f5bef80d5 100644 --- a/main/shim/le_advertising_manager.cc +++ b/main/shim/le_advertising_manager.cc @@ -50,24 +50,6 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, void Init() { // Register callback bluetooth::shim::GetAdvertising()->RegisterAdvertisingCallback(this); - - if (!bluetooth::common::init_flags::gd_security_is_enabled() && - !bluetooth::common::init_flags::gd_acl_is_enabled()) { - // Set private policy - auto address = bluetooth::shim::GetController()->GetMacAddress(); - auto storage = bluetooth::shim::GetStorage(); - auto adapter_config = storage->GetAdapterConfig(); - auto irk_bytes = adapter_config.GetLeIdentityResolvingKey(); - std::array irk{0}; - std::copy_n(irk.begin(), 16, irk_bytes->data()); - bluetooth::hci::AddressWithType address_with_type( - address, bluetooth::hci::AddressType::PUBLIC_DEVICE_ADDRESS); - auto minimum_rotation_time = std::chrono::minutes(7); - auto maximum_rotation_time = std::chrono::minutes(15); - bluetooth::shim::GetAclManager()->SetPrivacyPolicyForInitiatorAddress( - bluetooth::hci::LeAddressManager::AddressPolicy::USE_PUBLIC_ADDRESS, - address_with_type, irk, minimum_rotation_time, maximum_rotation_time); - } } // nobody use this function -- 2.11.0