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

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

dumpsys: Remove shim dumpsys output 

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I04c9c51fa4d43f89cccf8f5f8c45e6074e641408
parent 7b379149

system/gd/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -641,10 +641,8 @@ genrule { 
        "dumpsys_data.fbs",

        "module_unittest.fbs",

        "os/wakelock_manager.fbs",

        "shim/dumpsys.fbs",

    ],

    out: [

        "dumpsys.bfbs",

        "dumpsys_data.bfbs",

        "wakelock_manager.bfbs",

    ],
@@ -660,11 +658,9 @@ genrule { 
        "dumpsys_data.fbs",

        "module_unittest.fbs",

        "os/wakelock_manager.fbs",

        "shim/dumpsys.fbs",

    ],

    out: [

        "dumpsys_data_generated.h",

        "dumpsys_generated.h",

        "wakelock_manager_generated.h",

    ],

}

system/gd/BUILD.gn

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ flatbuffer("BluetoothGeneratedDumpsysDataSchema_h") { 
  sources = [

    "dumpsys_data.fbs",

    "os/wakelock_manager.fbs",

    "shim/dumpsys.fbs",

  ]

}
@@ -90,7 +89,6 @@ bt_flatc_binary_schema("BluetoothGeneratedDumpsysBinarySchema_bfbs") { 
  sources = [

    "dumpsys_data.fbs",

    "os/wakelock_manager.fbs",

    "shim/dumpsys.fbs",

  ]



  include_dir = "system/gd"

system/gd/dumpsys_data.fbs

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


include "module_unittest.fbs";

include "os/wakelock_manager.fbs";

include "shim/dumpsys.fbs";



namespace bluetooth;
@@ -20,7 +19,6 @@ attribute "privacy"; 
table DumpsysData {

    title:string (privacy:"Any");

    wakelock_manager_data:bluetooth.os.WakelockManagerData (privacy:"Any");

    shim_dumpsys_data:bluetooth.shim.DumpsysModuleData (privacy:"Any");

    module_unittest_data:bluetooth.ModuleUnitTestData; // private

}

system/gd/shim/dumpsys.cc

+0 −14
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <string>



#include "dumpsys/filter.h"

#include "dumpsys_data_generated.h"

#include "hci/acl_manager.h"

#include "hci/controller_interface.h"

#include "main/shim/entry.h"
@@ -182,19 +181,6 @@ void Dumpsys::Start() { pimpl_ = std::make_unique<impl>(*this, reflection_schema 


void Dumpsys::Stop() { pimpl_.reset(); }



DumpsysDataFinisher Dumpsys::GetDumpsysData(flatbuffers::FlatBufferBuilder* fb_builder) const {

  auto name = fb_builder->CreateString("----- Shim Dumpsys -----");



  DumpsysModuleDataBuilder builder(*fb_builder);

  builder.add_title(name);

  builder.add_number_of_bundled_schemas(pimpl_->GetNumberOfBundledSchemas());

  auto dumpsys_data = builder.Finish();



  return [dumpsys_data](DumpsysDataBuilder* builder) {

    builder->add_shim_dumpsys_data(dumpsys_data);

  };

}



std::string Dumpsys::ToString() const { return kModuleName; }



}  // namespace shim

system/gd/shim/dumpsys.fbs

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
// shim::dumpsys data

namespace bluetooth.shim;



attribute "privacy";



table ExamplePiecemealTable {

    example_string:string (privacy:"Any");

    example_int:int (privacy:"Any");

    example_float:float (privacy:"Any");

}



table ExampleInstantTable {

    example_string:string (privacy:"Any");

    example_int:int (privacy:"Any");

    example_float:float (privacy:"Any");

}



table DumpsysModuleData {

    title:string (privacy:"Any");

    number_of_bundled_schemas:int (privacy:"Any");

}



root_type DumpsysModuleData;