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

Commit 30da4035 authored by Zongheng Wang's avatar Zongheng Wang Committed by android-build-merger
Browse files

Merge "Add ToString() to Modules" am: ac8eabf3 am: 6e1d6a4e 

am: 3bcf8351

Change-Id: I467065f9e7712a912f9827c060d96abe402f6fcc
parents 1b547dc6 3bcf8351

system/gd/grpc/grpc_module.cc

+8 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ void GrpcModule::RunGrpcLoop() { 
  }

}



std::string GrpcModule::ToString() const {

  return "Grpc Module";

}



const ::bluetooth::ModuleFactory GrpcModule::Factory = ::bluetooth::ModuleFactory([]() {

  return new GrpcModule();

});
@@ -119,5 +123,9 @@ void GrpcFacadeModule::Stop() { 
  GetDependency<GrpcModule>()->Unregister(this);

}



std::string GrpcFacadeModule::ToString() const {

  return "Grpc Facade Module";

}



}  // namespace grpc

}  // namespace bluetooth

system/gd/grpc/grpc_module.h

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ class GrpcModule : public ::bluetooth::Module { 


  void Stop() override;



  std::string ToString() const override;



 private:

  bool started_;

  std::unique_ptr<::grpc::Server> server_ = nullptr;
@@ -70,6 +72,8 @@ class GrpcFacadeModule : public ::bluetooth::Module { 
  virtual void OnServerStarted(::grpc::ServerCompletionQueue* cq) {}



  virtual void OnServerStopped() {}



  std::string ToString() const override;

};



}  // namespace grpc

system/gd/hci/acl_manager.cc

+4 −0
Original line number Diff line number Diff line
@@ -1799,6 +1799,10 @@ void AclManager::Stop() { 
  pimpl_->Stop();

}



std::string AclManager::ToString() const {

  return "Acl Manager";

}



const ModuleFactory AclManager::Factory = ModuleFactory([]() { return new AclManager(); });



AclManager::~AclManager() = default;

system/gd/hci/acl_manager.h

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ class AclManager : public Module { 


  void Stop() override;



  std::string ToString() const override;



 private:

  friend AclConnection;

system/gd/hci/classic_security_manager.cc

+4 −0
Original line number Diff line number Diff line
@@ -358,6 +358,10 @@ void ClassicSecurityManager::Stop() { 
  pimpl_->Stop();

}



std::string ClassicSecurityManager::ToString() const {

  return "Classic Security Manager";

}



const ModuleFactory ClassicSecurityManager::Factory = ModuleFactory([]() { return new ClassicSecurityManager(); });



}  // namespace hci