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

Commit 2838f8c6 authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz Committed by Gerrit Code Review
Browse files

Merge "Remove gd_hal_snoop_logger_filtering feature flag" into main

parents f7a75b6d 76e72cc5

system/gd/common/init_flags.h

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ class InitFlags final { 
    return init_flags::gd_hal_snoop_logger_socket_is_enabled();

  }



  inline static bool IsSnoopLoggerFilteringEnabled() {

    return init_flags::gd_hal_snoop_logger_filtering_is_enabled();

  }



  inline static bool IsBluetoothQualityReportCallbackEnabled() {

    return init_flags::bluetooth_quality_report_callback_is_enabled();

  }

system/gd/common/init_flags_test.cc

+0 −6
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ TEST(InitFlagsTest, test_device_iot_config_logging_is_enabled) { 
  ASSERT_TRUE(InitFlags::IsDeviceIotConfigLoggingEnabled());

}



TEST(InitFlagsTest, test_enable_snoop_logger_filtering) {

  const char* input[] = {"INIT_gd_hal_snoop_logger_filtering=true", nullptr};

  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::IsSnoopLoggerFilteringEnabled());

}



TEST(InitFlagsTest, test_enable_bluetooth_quality_report_callback) {

  const char* input[] = {"INIT_bluetooth_quality_report_callback=true", nullptr};

  InitFlags::Load(input);

system/gd/hal/snoop_logger.cc

+0 −5
Original line number Diff line number Diff line
@@ -496,11 +496,6 @@ SnoopLogger::SnoopLogger( 
      snoop_log_persists(snoop_log_persists) {

  btsnoop_mode_ = btsnoop_mode;



  if (btsnoop_mode_ == kBtSnoopLogModeFiltered &&

      !bluetooth::common::InitFlags::IsSnoopLoggerFilteringEnabled()) {

    btsnoop_mode_ = kBtSnoopLogModeDisabled;

  }



  if (btsnoop_mode_ == kBtSnoopLogModeFiltered) {

    LOG_INFO("Snoop Logs filtered mode enabled");

    EnableFilters();

system/gd/hal/snoop_logger_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ using namespace std::chrono_literals; 
const char* test_flags[] = {

    "INIT_logging_debug_enabled_for_all=true",

    "INIT_gd_hal_snoop_logger_socket=true",

    "INIT_gd_hal_snoop_logger_filtering=true",

    nullptr,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ init_flags!( 
        gatt_robust_caching_server,

        gd_core,

        gd_hal_snoop_logger_socket = true,

        gd_hal_snoop_logger_filtering = true,

        gd_l2cap,

        gd_link_policy,

        hci_adapter: i32,