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

Commit 5b1eda43 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove unused duplicated ACL le privacy setting am: 5ce281ab

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

Change-Id: I605bf8e402277beb809a09f231c3d0e5432e3f0f
parents 39d2334c 5ce281ab
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -1361,27 +1361,6 @@ void shim::legacy::Acl::OnLeConnectFail(hci::AddressWithType address_with_type,
      base::StringPrintf("le reason:%s", hci::ErrorCodeText(reason).c_str()));
}

void shim::legacy::Acl::ConfigureLePrivacy(bool is_le_privacy_enabled) {
  LOG_INFO("Configuring Le privacy:%s",
           (is_le_privacy_enabled) ? "true" : "false");
  ASSERT_LOG(is_le_privacy_enabled,
             "Gd shim does not support unsecure le privacy");

  // 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);
  /* 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, minimum_rotation_time,
      maximum_rotation_time);
}

void shim::legacy::Acl::DisconnectClassic(uint16_t handle, tHCI_STATUS reason) {
  handler_->CallOn(pimpl_.get(), &Acl::impl::disconnect_classic, handle,
                   reason);
+0 −2
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ class Acl : public hci::acl_manager::ConnectionCallbacks,
  void WriteData(uint16_t hci_handle,
                 std::unique_ptr<packet::RawBuilder> packet);

  void ConfigureLePrivacy(bool is_le_privacy_enabled);

  void Dump(int fd) const;
  void DumpConnectionHistory(int fd) const;