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

Commit 25c35d00 authored by Martin Brabham's avatar Martin Brabham
Browse files

SM: Move SecurityRecordDatabase into the SecurityRecord namespace 

 #gd-refactor

Bug: 145638034
Test: bluetooth_gd_test
Change-Id: I5b1cc7f5165a33c1e8480b1dd441e3a2a2c13ede
parent eb8a5ab6

system/gd/security/internal/security_manager_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "security/pairing/classic_pairing_handler.h"

#include "security/pairing_handler_le.h"

#include "security/record/security_record.h"

#include "security/security_record_database.h"

#include "security/record/security_record_database.h"



namespace bluetooth {

namespace security {
@@ -180,7 +180,7 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub 
  std::unique_ptr<l2cap::le::FixedChannelManager> l2cap_manager_le_;

  hci::LeSecurityInterface* hci_security_interface_le_ __attribute__((unused));

  channel::SecurityManagerChannel* security_manager_channel_;

  SecurityRecordDatabase security_database_;

  record::SecurityRecordDatabase security_database_;

  std::unordered_map<hci::Address, std::shared_ptr<pairing::PairingHandler>> pairing_handler_map_;

  hci::IoCapability local_io_capability_ = kDefaultIoCapability;

  hci::AuthenticationRequirements local_authentication_requirements_ = kDefaultAuthenticationRequirements;

system/gd/security/security_record_database.h→system/gd/security/record/security_record_database.h

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


namespace bluetooth {

namespace security {

namespace record {



class SecurityRecordDatabase {

 public:
@@ -59,5 +60,6 @@ class SecurityRecordDatabase { 
  std::vector<record::SecurityRecord> records_;

};



}  // namespace record

}  // namespace security

}  // namespace bluetooth