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

Commit ef9c4e97 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/gd: Remove unimplemented Module virtual methods 

- void Module::GetDumpsys() const
- void Module::GetDumpsys(int fd) const
- void Module::GetDumpsys(std::ostringstream& oss) const

These methods are never meaningfully implemented.
Having multiple GetDumpsys() methods (4!) makes it confusing
to know which should be implemented.

Bug: 333555245
Test: m com.android.btservices
Flag: EXEMPT, no-op change
Change-Id: I031ddff1a44054053acead7a1ff50d50b3fca426
parent 1bb1d1f3

system/gd/module.cc

+0 −6
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ DumpsysDataFinisher Module::GetDumpsysData(flatbuffers::FlatBufferBuilder* /* bu 
  return EmptyDumpsysDataFinisher;

}



void Module::GetDumpsysData(int /* fd */) const {}



void Module::GetDumpsysData() const {}



void Module::GetDumpsysData(std::ostringstream& /* oss */) const {}



Module* ModuleRegistry::Get(const ModuleFactory* module) const {

  auto instance = started_modules_.find(module);

  log::assert_that(

system/gd/module.h

+0 −3
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ class Module { 
  }



  virtual DumpsysDataFinisher GetDumpsysData(flatbuffers::FlatBufferBuilder* builder) const;

  virtual void GetDumpsysData() const;

  virtual void GetDumpsysData(int fd) const;

  virtual void GetDumpsysData(std::ostringstream& oss) const;



 private:

  Module* GetDependency(const ModuleFactory* module) const;

system/gd/module_dumper.cc

+1 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ using ::bluetooth::os::WakelockManager; 


namespace bluetooth {



void ModuleDumper::DumpState(std::string* output, std::ostringstream& oss) const {

void ModuleDumper::DumpState(std::string* output, std::ostringstream& /*oss*/) const {

  log::assert_that(output != nullptr, "assert failed: output != nullptr");



  flatbuffers::FlatBufferBuilder builder(1024);
@@ -55,9 +55,6 @@ void ModuleDumper::DumpState(std::string* output, std::ostringstream& oss) const 
    log::assert_that(

        instance != module_registry_.started_modules_.end(),

        "assert failed: instance != module_registry_.started_modules_.end()");

    instance->second->GetDumpsysData();

    instance->second->GetDumpsysData(fd_);

    instance->second->GetDumpsysData(oss);

    queue.push(instance->second->GetDumpsysData(&builder));

  }

system/gd/module_dumper.h

+2 −3
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ class ModuleRegistry; 


class ModuleDumper {

 public:

  ModuleDumper(int fd, const ModuleRegistry& module_registry, const char* title)

      : fd_(fd), module_registry_(module_registry), title_(title) {}

  ModuleDumper(int /*fd*/, const ModuleRegistry& module_registry, const char* title)

      : module_registry_(module_registry), title_(title) {}

  void DumpState(std::string* output, std::ostringstream& oss) const;



 private:

  const int fd_{-1};

  const ModuleRegistry& module_registry_;

  const std::string title_;

};

system/gd/module_state_dumper_unittest.cc

+0 −14
Original line number Diff line number Diff line
@@ -71,20 +71,6 @@ DumpsysDataFinisher StateDumperTestModule::GetDumpsysData( 
  return EmptyDumpsysDataFinisher;

}



void StateDumperTestModule::GetDumpsysData() const {

  log::info("void");

}



void StateDumperTestModule::GetDumpsysData(int fd) const {

  log::info("fd");

  dprintf(fd, "GetDumpsysData(int fd)");

}



void StateDumperTestModule::GetDumpsysData(std::ostringstream& oss) const {

  log::info("oss");

  oss << "GetDumpsysData(std::ostringstream& oss)";

}



//

// Module GDx Testing Below

//