config: Remove TraceConf key from config

- used to enable/disable the use of individual TRC_*
  keys in the config file, now removed

Bug: 305066880
Test: m com.android.btservices
Change-Id: I50a8f968d98b9e83b27088130c81371c4e658b1e

9 files changed, 43 insertions, 49 deletions

diff --git a/system/bta/le_audio/le_audio_client_test.cc b/system/bta/le_audio/le_audio_client_test.cc
index cda60e95fa..dadd173cc4 100644
--- a/system/bta/le_audio/le_audio_client_test.cc
+++ b/system/bta/le_audio/le_audio_client_test.cc
@@ -172,7 +172,6 @@ void invoke_switch_codec_cb(bool is_low_latency_buffer_size) {}
 void invoke_switch_buffer_size_cb(bool is_low_latency_buffer_size) {}
 
 const std::string kSmpOptions("mock smp options");
-bool get_trace_config_enabled(void) { return false; }
 bool get_pts_avrcp_test(void) { return false; }
 bool get_pts_secure_only_mode(void) { return false; }
 bool get_pts_conn_updates_disabled(void) { return false; }
@@ -189,7 +188,6 @@ bool get_pts_le_audio_disable_ases_before_stopping(void) { return false; }
 config_t* get_all(void) { return nullptr; }
 
 stack_config_t mock_stack_config{
-    .get_trace_config_enabled = get_trace_config_enabled,
     .get_pts_avrcp_test = get_pts_avrcp_test,
     .get_pts_secure_only_mode = get_pts_secure_only_mode,
     .get_pts_conn_updates_disabled = get_pts_conn_updates_disabled,
diff --git a/system/conf/bt_stack.conf b/system/conf/bt_stack.conf
index 9b6a5197a0..f680ec32e9 100644
--- a/system/conf/bt_stack.conf
+++ b/system/conf/bt_stack.conf
@@ -1,7 +1,3 @@
-# Enable trace level reconfiguration function
-# Must be present before any TRC_ trace level settings
-TraceConf=true
-
 # This is Log configuration for new C++ code using LOG() macros.
 # See libchrome/base/logging.h for description on how to configure your logs.
 # sample configuration:
@@ -91,7 +87,6 @@ TraceConf=true
 #  SMP_NUMERIC_COMPAR_FAIL = 12
 #PTS_SmpFailureCase=0
 
-
 # PTS Broadcast audio configuration option
 # Option:
 # lc3_stereo_48_1_2
diff --git a/system/internal_include/stack_config.h b/system/internal_include/stack_config.h
index efaec3f700..febd2a37e2 100644
--- a/system/internal_include/stack_config.h
+++ b/system/internal_include/stack_config.h
@@ -26,7 +26,6 @@
 static const char STACK_CONFIG_MODULE[] = "stack_config_module";
 
 typedef struct {
-  bool (*get_trace_config_enabled)(void);
   bool (*get_pts_avrcp_test)(void);
   bool (*get_pts_secure_only_mode)(void);
   bool (*get_pts_conn_updates_disabled)(void);
diff --git a/system/main/bte_logmsg.cc b/system/main/bte_logmsg.cc
index a68a542ab0..4abc5d3d65 100644
--- a/system/main/bte_logmsg.cc
+++ b/system/main/bte_logmsg.cc
@@ -21,20 +21,13 @@
 #include <cstdarg>
 #include <cstdint>
 
-#include "internal_include/bt_trace.h"
+#include "bt_trace.h"
 #include "internal_include/stack_config.h"
 #include "main/main_int.h"
-#include "osi/include/log.h"
 
 static future_t* init(void) {
   const stack_config_t* stack_config = stack_config_get_interface();
-  if (!stack_config->get_trace_config_enabled()) {
-    LOG_INFO("using compile default trace settings");
-    return NULL;
-  }
-
   init_cpp_logging(stack_config->get_all());
-
   return NULL;
 }
 
diff --git a/system/main/stack_config.cc b/system/main/stack_config.cc
index 63d35d436f..24798cc4e1 100644
--- a/system/main/stack_config.cc
+++ b/system/main/stack_config.cc
@@ -26,7 +26,6 @@
 #include "osi/include/log.h"
 
 namespace {
-const char* TRACE_CONFIG_ENABLED_KEY = "TraceConf";
 const char* PTS_AVRCP_TEST = "PTS_AvrcpTest";
 const char* PTS_SECURE_ONLY_MODE = "PTS_SecurePairOnly";
 const char* PTS_LE_CONN_UPDATED_DISABLED = "PTS_DisableConnUpdates";
@@ -94,11 +93,6 @@ EXPORT_SYMBOL extern const module_t stack_config_module = {
     .dependencies = {NULL}};
 
 // Interface functions
-static bool get_trace_config_enabled(void) {
-  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,
-                         TRACE_CONFIG_ENABLED_KEY, false);
-}
-
 static bool get_pts_avrcp_test(void) {
   return config_get_bool(*config, CONFIG_DEFAULT_SECTION, PTS_AVRCP_TEST,
                          false);
@@ -211,7 +205,6 @@ static bool get_pts_le_audio_disable_ases_before_stopping(void) {
 static config_t* get_all(void) { return config.get(); }
 
 const stack_config_t interface = {
-    get_trace_config_enabled,
     get_pts_avrcp_test,
     get_pts_secure_only_mode,
     get_pts_conn_updates_disabled,
diff --git a/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc b/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc
index a50f9b560b..686fd308ff 100644
--- a/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc
+++ b/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc
@@ -69,17 +69,27 @@ class FakeA2dpInterface : public A2dpInterface {
 
 bool get_pts_avrcp_test(void) { return false; }
 
-const stack_config_t interface = {nullptr, get_pts_avrcp_test,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
+const stack_config_t interface = {get_pts_avrcp_test,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
                                   nullptr};
 
 void Callback(uint8_t, bool, std::unique_ptr<::bluetooth::PacketBuilder>) {}
diff --git a/system/profile/avrcp/tests/avrcp_device_test.cc b/system/profile/avrcp/tests/avrcp_device_test.cc
index 95d6f59049..92766ceae4 100644
--- a/system/profile/avrcp/tests/avrcp_device_test.cc
+++ b/system/profile/avrcp/tests/avrcp_device_test.cc
@@ -52,17 +52,27 @@ using ::testing::SaveArg;
 
 bool get_pts_avrcp_test(void) { return false; }
 
-const stack_config_t interface = {nullptr, get_pts_avrcp_test,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
-                                  nullptr, nullptr,
+const stack_config_t interface = {get_pts_avrcp_test,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
+                                  nullptr,
                                   nullptr};
 
 // TODO (apanicke): All the tests below are just basic positive unit tests.
diff --git a/system/stack/test/stack_smp_test.cc b/system/stack/test/stack_smp_test.cc
index c5e523885b..21c33239d2 100644
--- a/system/stack/test/stack_smp_test.cc
+++ b/system/stack/test/stack_smp_test.cc
@@ -43,7 +43,6 @@ tBTM_CB btm_cb;
 const std::string kSmpOptions("mock smp options");
 const std::string kBroadcastAudioConfigOptions(
     "mock broadcast audio config options");
-bool get_trace_config_enabled(void) { return false; }
 bool get_pts_avrcp_test(void) { return false; }
 bool get_pts_secure_only_mode(void) { return false; }
 bool get_pts_conn_updates_disabled(void) { return false; }
@@ -71,7 +70,6 @@ config_t* get_all(void) { return nullptr; }
 const packet_fragmenter_t* packet_fragmenter_get_interface() { return nullptr; }
 
 stack_config_t mock_stack_config{
-    .get_trace_config_enabled = get_trace_config_enabled,
     .get_pts_avrcp_test = get_pts_avrcp_test,
     .get_pts_secure_only_mode = get_pts_secure_only_mode,
     .get_pts_conn_updates_disabled = get_pts_conn_updates_disabled,
diff --git a/system/test/common/stack_config.cc b/system/test/common/stack_config.cc
index 41374008bd..b6cc200103 100644
--- a/system/test/common/stack_config.cc
+++ b/system/test/common/stack_config.cc
@@ -25,7 +25,6 @@
 const std::string kSmpOptions("mock smp options");
 const std::string kBroadcastAudioConfigOptions(
     "mock broadcast audio config options");
-bool get_trace_config_enabled(void) { return false; }
 bool get_pts_avrcp_test(void) { return false; }
 bool get_pts_secure_only_mode(void) { return false; }
 bool get_pts_conn_updates_disabled(void) { return false; }
@@ -55,7 +54,6 @@ struct packet_fragmenter_t;
 const packet_fragmenter_t* packet_fragmenter_get_interface() { return nullptr; }
 
 stack_config_t mock_stack_config{
-    .get_trace_config_enabled = get_trace_config_enabled,
     .get_pts_avrcp_test = get_pts_avrcp_test,
     .get_pts_secure_only_mode = get_pts_secure_only_mode,
     .get_pts_conn_updates_disabled = get_pts_conn_updates_disabled,