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

Commit 316ded94 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "[InitFlags] Simplify init flags dumpsys" am: b0f55815 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2574390



Change-Id: I95261bfd45f1e228ca8886d0ae612d0c76b29d8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7966d15e b0f55815

system/gd/common/init_flags.fbs

+5 −51
Original line number Diff line number Diff line
@@ -2,60 +2,14 @@ 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_acl_enabled:bool (privacy:"Any");

    gd_hci_enabled:bool (privacy:"Any");

    gd_controller_enabled:bool (privacy:"Any");

    values:[InitFlagValue] (privacy:"Any");

}



    always_send_services_if_gatt_disc_done_is_enabled:bool (private:"Any");

    always_use_private_gatt_for_debugging_is_enabled:bool (private:"Any");

    asynchronously_start_l2cap_coc_is_enabled:bool (privacy:"Any");

    btaa_hci_is_enabled:bool (privacy:"Any");

    bta_dm_clear_conn_id_on_client_close_is_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel_is_enabled:bool (privacy:"Any");

    classic_discovery_only_is_enabled:bool (privacy:"Any");

    clear_hidd_interrupt_cid_on_disconnect_is_enabled:bool (privacy:"Any");

    delay_hidh_cleanup_until_hidh_ready_start_is_enabled:bool (privacy:"Any");

    device_iot_config_logging_is_enabled:bool (privacy:"Any");

    dynamic_avrcp_version_enhancement_is_enabled:bool (privacy:"Any");

    finite_att_timeout_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_hal_snoop_logger_filtering_is_enabled:bool (privacy:"Any");

    gd_hal_snoop_logger_socket_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_default_log_level:int (privacy:"Any");

    get_hci_adapter:int (privacy:"Any");

    // get_log_level_for_tag -- skipped in dumpsys

    hfp_dynamic_version_is_enabled:bool (privacy:"Any");

    irk_rotation_is_enabled:bool (privacy:"Any");

    leaudio_targeted_announcement_reconnection_mode_is_enabled: bool (privacy:"Any");

    pass_phy_update_callback_is_enabled:bool (privacy:"Any");

    pbap_pse_dynamic_version_upgrade_is_enabled:bool (privacy:"Any");

    periodic_advertising_adi_is_enabled:bool (privacy:"Any");

    private_gatt_is_enabled:bool (privacy:"Any");

    queue_l2cap_coc_while_encrypting_is_enabled:bool (privacy:"Any");

    read_encryption_key_size_is_enabled:bool (privacy:"Any");

    redact_log_is_enabled:bool (privacy:"Any");

    rust_event_loop_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

    bluetooth_quality_report_callback_is_enabled:bool (privacy:"Any");

    set_min_encryption_is_enabled:bool (privacy:"Any");

    subrating_is_enabled:bool (privacy:"Any");

    trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled:bool (privacy:"Any");

    use_unified_connection_manager_is_enabled:bool (privacy:"Any");

table InitFlagValue {

    flag:string (privacy:"Any");

    value:string (privacy:"Any");

}

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



root_type InitFlagsData;

system/gd/dumpsys/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ filegroup { 
    name: "BluetoothDumpsysSources",

    srcs: [

        "filter.cc",

        "init_flags.cc",

        "internal/filter_internal.cc",

        "reflection_schema.cc",

    ],

system/gd/dumpsys/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import("//bt/system/gd/dumpsys/bundler/bundler.gni") 
source_set("BluetoothDumpsysSources") {

  sources = [

    "filter.cc",

    "init_flags.cc",

    "internal/filter_internal.cc",

    "reflection_schema.cc",

  ]

system/gd/dumpsys/init_flags.cc

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "common/init_flags.h"



#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 -----");

  common::InitFlagsDataBuilder builder(*fb_builder);

  builder.add_title(title);

  builder.add_gd_advertising_enabled(true);

  builder.add_gd_scanning_enabled(true);

  builder.add_gd_acl_enabled(true);

  builder.add_gd_hci_enabled(true);

  builder.add_gd_controller_enabled(true);



  builder.add_always_send_services_if_gatt_disc_done_is_enabled(

      initFlags::always_send_services_if_gatt_disc_done_is_enabled());

  builder.add_always_use_private_gatt_for_debugging_is_enabled(

      initFlags::always_use_private_gatt_for_debugging_is_enabled());

  builder.add_asynchronously_start_l2cap_coc_is_enabled(initFlags::asynchronously_start_l2cap_coc_is_enabled());

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

  builder.add_bta_dm_clear_conn_id_on_client_close_is_enabled(

      initFlags::bta_dm_clear_conn_id_on_client_close_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_device_iot_config_logging_is_enabled(

      initFlags::device_iot_config_logging_is_enabled());

  builder.add_classic_discovery_only_is_enabled(initFlags::classic_discovery_only_is_enabled());

  builder.add_clear_hidd_interrupt_cid_on_disconnect_is_enabled(

      initFlags::clear_hidd_interrupt_cid_on_disconnect_is_enabled());

  builder.add_delay_hidh_cleanup_until_hidh_ready_start_is_enabled(

      initFlags::delay_hidh_cleanup_until_hidh_ready_start_is_enabled());

  builder.add_dynamic_avrcp_version_enhancement_is_enabled(

      initFlags::dynamic_avrcp_version_enhancement_is_enabled());

  builder.add_gd_hal_snoop_logger_filtering_is_enabled(

      bluetooth::common::init_flags::gd_hal_snoop_logger_filtering_is_enabled());

  builder.add_finite_att_timeout_is_enabled(initFlags::finite_att_timeout_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_hal_snoop_logger_socket_is_enabled(

      bluetooth::common::init_flags::gd_hal_snoop_logger_socket_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_remote_name_request_is_enabled(initFlags::gd_remote_name_request_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_default_log_level(initFlags::get_default_log_level());

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

  // get_log_level_for_tag -- skipped in dumpsys

  builder.add_hfp_dynamic_version_is_enabled(initFlags::hfp_dynamic_version_is_enabled());

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

  builder.add_leaudio_targeted_announcement_reconnection_mode_is_enabled(

      initFlags::leaudio_targeted_announcement_reconnection_mode_is_enabled());

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

  builder.add_pbap_pse_dynamic_version_upgrade_is_enabled(

      initFlags::pbap_pse_dynamic_version_upgrade_is_enabled());

  builder.add_periodic_advertising_adi_is_enabled(bluetooth::common::init_flags::periodic_advertising_adi_is_enabled());

  builder.add_queue_l2cap_coc_while_encrypting_is_enabled(

      initFlags::queue_l2cap_coc_while_encrypting_is_enabled());

  builder.add_private_gatt_is_enabled(initFlags::private_gatt_is_enabled());

  builder.add_read_encryption_key_size_is_enabled(

      bluetooth::common::init_flags::read_encryption_key_size_is_enabled());

  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_rust_event_loop_is_enabled(initFlags::rust_event_loop_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());

  builder.add_bluetooth_quality_report_callback_is_enabled(

      initFlags::bluetooth_quality_report_callback_is_enabled());

  builder.add_set_min_encryption_is_enabled(bluetooth::common::init_flags::set_min_encryption_is_enabled());

  builder.add_subrating_is_enabled(initFlags::subrating_is_enabled());

  builder.add_trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled(

      initFlags::trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled());

  builder.add_use_unified_connection_manager_is_enabled(

      initFlags::use_unified_connection_manager_is_enabled());



  return builder.Finish();

}

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

system/gd/dumpsys/init_flags.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "flatbuffers/flatbuffers.h"

#include "init_flags_generated.h"



namespace bluetooth {

namespace dumpsys {



class InitFlags {

 public:

  static flatbuffers::Offset<common::InitFlagsData> Dump(flatbuffers::FlatBufferBuilder* fb_builder);

};



}  // namespace dumpsys

}  // namespace bluetooth