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

Commit 483276f6 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap: Depend on Advertising to set privacy am: d4fbd152 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e22830185cc55f39c4fc84b2772a46321fbc8f1
parents 7a025d9d d4fbd152

system/main/shim/l2c_api.cc

+0 −17
Original line number Original line Diff line number Diff line
@@ -663,23 +663,6 @@ void L2CA_UseLegacySecurityModule() { 
  GetL2capLeModule()->InjectSecurityEnforcementInterface(

  GetL2capLeModule()->InjectSecurityEnforcementInterface(

      &le_security_enforcement_shim_);

      &le_security_enforcement_shim_);





  // 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);



  GetAclManager()->HACK_SetScoDisconnectCallback(on_sco_disconnect);

  GetAclManager()->HACK_SetScoDisconnectCallback(on_sco_disconnect);

}

}

system/main/shim/stack.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ void Stack::StartEverything() { 
  if (common::init_flags::gd_l2cap_is_enabled()) {

  if (common::init_flags::gd_l2cap_is_enabled()) {

    modules.add<l2cap::classic::L2capClassicModule>();

    modules.add<l2cap::classic::L2capClassicModule>();

    modules.add<l2cap::le::L2capLeModule>();

    modules.add<l2cap::le::L2capLeModule>();

    modules.add<hci::LeAdvertisingManager>();

  }

  }

  if (common::init_flags::gd_security_is_enabled()) {

  if (common::init_flags::gd_security_is_enabled()) {

    modules.add<security::SecurityModule>();

    modules.add<security::SecurityModule>();