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

Commit 379f6f9e authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use bluetooth::shim::legacy::Acl::ConfigureLePrivacy am: 6e7af2a5 am:... 

Use bluetooth::shim::legacy::Acl::ConfigureLePrivacy am: 6e7af2a5 am: 1fa4c0f9 am: e7379d6f am: 1e2c3de7

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

Change-Id: I922e99beafb1e67cbd602262447528912d99eac6
parents f43bb555 1e2c3de7

system/main/shim/acl.cc

+0 −17
Original line number Diff line number Diff line
@@ -422,23 +422,6 @@ bluetooth::shim::legacy::Acl::Acl(os::Handler* handler, 
  GetAclManager()->RegisterLeCallbacks(this, handler_);

  GetController()->RegisterCompletedMonitorAclPacketsCallback(

      handler->BindOn(this, &Acl::on_incoming_acl_credits));



  // TODO(b/161543441): read the privacy policy from device-specific

  // configuration, and IRK from config file.

  hci::LeAddressManager::AddressPolicy address_policy =

      hci::LeAddressManager::AddressPolicy::USE_RESOLVABLE_ADDRESS;

  hci::AddressWithType empty_address_with_type(

      hci::Address{}, hci::AddressType::RANDOM_DEVICE_ADDRESS);

  crypto_toolbox::Octet16 rotation_irk = {0x44, 0xfb, 0x4b, 0x8d, 0x6c, 0x58,

                                          0x21, 0x0c, 0xf9, 0x3d, 0xda, 0xf1,

                                          0x64, 0xa3, 0xbb, 0x7f};

  /* 7 minutes minimum, 15 minutes maximum for random address refreshing */

  auto minimum_rotation_time = std::chrono::minutes(7);

  auto maximum_rotation_time = std::chrono::minutes(15);



  GetAclManager()->SetPrivacyPolicyForInitiatorAddress(

      address_policy, empty_address_with_type, rotation_irk,

      minimum_rotation_time, maximum_rotation_time);

}



bluetooth::shim::legacy::Acl::~Acl() {

system/stack/btm/btm_ble_gap.cc

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include "common/time_util.h"

#include "device/include/controller.h"

#include "main/shim/acl_api.h"

#include "main/shim/btm_api.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"
@@ -618,6 +619,9 @@ bool BTM_BleConfigPrivacy(bool privacy_mode) { 


  GAP_BleAttrDBUpdate(GATT_UUID_GAP_CENTRAL_ADDR_RESOL, &gap_ble_attr_value);



  if (bluetooth::shim::is_gd_acl_enabled()) {

    bluetooth::shim::ACL_ConfigureLePrivacy(privacy_mode);

  }

  return true;

}