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

Commit b30a8e58 authored by William Escande's avatar William Escande Committed by Rahul Arya
Browse files

Clear init_flags dumpsys and add lint 

Tag: #refactor
Test: Build + adb shell dumpsys bluetooth_manager
Bug: 251328572
Merged-In: Id7367461062bb9199696b3392b5973f74734f789
Change-Id: Id7367461062bb9199696b3392b5973f74734f789
(cherry picked from commit 76f97215)
parent 526b51e0

system/gd/common/init_flags.fbs

+19 −4
Original line number Diff line number Diff line
@@ -2,18 +2,33 @@ namespace bluetooth.common; 


attribute "privacy";



// LINT.IfChange

table InitFlagsData {

    title:string (privacy:"Any");

    // Legacy flags

    gd_advertising_enabled:bool (privacy:"Any");

    gd_scanning_enabled:bool (privacy:"Any");

    gd_security_enabled:bool (privacy:"Any");

    gd_acl_enabled:bool (privacy:"Any");

    gd_hci_enabled:bool (privacy:"Any");

    gd_controller_enabled:bool (privacy:"Any");

    gd_core_enabled:bool (privacy:"Any");

    btaa_hci_log_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel:bool (privacy:"Any");

    btaa_hci_is_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel_is_enabled:bool (privacy:"Any");

    gatt_robust_caching_client_is_enabled:bool (privacy:"Any");

    gatt_robust_caching_server_is_enabled:bool (privacy:"Any");

    gd_core_is_enabled:bool (privacy:"Any");

    gd_l2cap_is_enabled:bool (privacy:"Any");

    gd_link_policy_is_enabled:bool (privacy:"Any");

    gd_remote_name_request_is_enabled:bool (privacy:"Any");

    gd_rust_is_enabled:bool (privacy:"Any");

    gd_security_is_enabled:bool (privacy:"Any");

    get_hci_adapter:int (privacy:"Any");

    irk_rotation_is_enabled:bool (privacy:"Any");

    // is_debug_logging_enabled_for_tag -- skipped in dumpsys

    logging_debug_enabled_for_all_is_enabled:bool (privacy:"Any");

    pass_phy_update_callback_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

}

// LINT.ThenChange(/system/gd/dumpsys/init_flags.cc)



root_type InitFlagsData;

system/gd/dumpsys/init_flags.cc

+21 −5
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#include "dumpsys/init_flags.h"

#include "init_flags_generated.h"



namespace initFlags = bluetooth::common::init_flags;



// LINT.IfChange

flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFlags::Dump(

    flatbuffers::FlatBufferBuilder* fb_builder) {

  auto title = fb_builder->CreateString("----- Init Flags -----");
@@ -25,13 +28,26 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_title(title);

  builder.add_gd_advertising_enabled(true);

  builder.add_gd_scanning_enabled(true);

  builder.add_gd_security_enabled(bluetooth::common::init_flags::gd_security_is_enabled());

  builder.add_gd_acl_enabled(true);

  builder.add_gd_hci_enabled(true);

  builder.add_gd_controller_enabled(true);

  builder.add_gd_core_enabled(bluetooth::common::init_flags::gd_core_is_enabled());

  builder.add_btaa_hci_log_enabled(bluetooth::common::init_flags::btaa_hci_is_enabled());

  builder.add_sdp_skip_rnr_if_known_is_enabled(bluetooth::common::init_flags::sdp_skip_rnr_if_known_is_enabled());



  builder.add_btaa_hci_is_enabled(initFlags::btaa_hci_is_enabled());

  builder.add_btm_dm_flush_discovery_queue_on_search_cancel_is_enabled(

      initFlags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled());

  builder.add_gatt_robust_caching_client_is_enabled(initFlags::gatt_robust_caching_client_is_enabled());

  builder.add_gatt_robust_caching_server_is_enabled(initFlags::gatt_robust_caching_server_is_enabled());

  builder.add_gd_core_is_enabled(initFlags::gd_core_is_enabled());

  builder.add_gd_l2cap_is_enabled(initFlags::gd_l2cap_is_enabled());

  builder.add_gd_link_policy_is_enabled(initFlags::gd_link_policy_is_enabled());

  builder.add_gd_rust_is_enabled(initFlags::gd_rust_is_enabled());

  builder.add_gd_security_is_enabled(initFlags::gd_security_is_enabled());

  builder.add_get_hci_adapter(initFlags::get_hci_adapter());

  builder.add_irk_rotation_is_enabled(initFlags::irk_rotation_is_enabled());

  // is_debug_logging_enabled_for_tag -- skipped in dumpsys

  builder.add_logging_debug_enabled_for_all_is_enabled(initFlags::logging_debug_enabled_for_all_is_enabled());

  builder.add_pass_phy_update_callback_is_enabled(initFlags::pass_phy_update_callback_is_enabled());

  builder.add_sdp_serialization_is_enabled(initFlags::sdp_serialization_is_enabled());

  builder.add_sdp_skip_rnr_if_known_is_enabled(initFlags::sdp_skip_rnr_if_known_is_enabled());

  return builder.Finish();

}

// LINT.ThenChange(/system/gd/rust/common/src/init_flags.rs)

system/gd/rust/common/src/init_flags.rs

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ fn parse_hci_adapter(flags: &mut InitFlags, values: Vec<&str>) { 
}



init_flags!(

    // LINT.IfChange

    flags: {

        btaa_hci = true,

        btm_dm_flush_discovery_queue_on_search_cancel,
@@ -191,6 +192,7 @@ init_flags!( 
    extra_fields: {

        logging_debug_explicit_tag_settings: ExplicitTagSettings,

    }

    // LINT.ThenChange(/system/gd/common/init_flags.fbs)

    extra_parsed_flags: {

        "INIT_logging_debug_enabled_for_tags" => parse_logging_tag(_, _, true),

        "INIT_logging_debug_disabled_for_tags" => parse_logging_tag(_, _, false),

system/gd/shim/dumpsys.cc

+3 −1
Original line number Diff line number Diff line
@@ -102,7 +102,9 @@ std::string Dumpsys::impl::PrintAsJson(std::string* dumpsys_data) const { 
    return std::string(buf);

  }



  flatbuffers::Parser parser;

  flatbuffers::IDLOptions options{};

  options.output_default_scalars_in_json = true;

  flatbuffers::Parser parser{options};

  if (!parser.Deserialize(schema)) {

    char buf[255];

    snprintf(buf, sizeof(buf), "ERROR: Unable to deserialize bundle root name:%s\n", root_name.c_str());