diff options
| author | 2024-10-03 17:18:23 +0000 | |
|---|---|---|
| committer | 2024-10-17 18:52:49 +0000 | |
| commit | aeadcdbc332c55de942b3c2e09637bdecef9be40 (patch) | |
| tree | ac9d4c157a1f34d5a79971185fdfd1f1f1cb8f4b | |
| parent | 9479db36efd6172535262daa300636edef8ef064 (diff) | |
Remove os/log.h
The logging macros within have long been removed,
this is just cleanup work to inline the included headers
where necessary
Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I2147ce4bdcea977b92318b2cb96e7020a8958161
225 files changed, 36 insertions, 334 deletions
diff --git a/system/audio_hal_interface/a2dp_encoding_host.cc b/system/audio_hal_interface/a2dp_encoding_host.cc index e9bb187339..92f4361b78 100644 --- a/system/audio_hal_interface/a2dp_encoding_host.cc +++ b/system/audio_hal_interface/a2dp_encoding_host.cc @@ -27,7 +27,6 @@ #include "btif/include/btif_a2dp_source.h" #include "btif/include/btif_av.h" #include "btif/include/btif_hf.h" -#include "os/log.h" #include "stack/include/avdt_api.h" #include "types/raw_address.h" #include "udrv/include/uipc.h" diff --git a/system/audio_hal_interface/aidl/a2dp/a2dp_encoding_aidl.h b/system/audio_hal_interface/aidl/a2dp/a2dp_encoding_aidl.h index 32ef7923d8..f470d5e06a 100644 --- a/system/audio_hal_interface/aidl/a2dp/a2dp_encoding_aidl.h +++ b/system/audio_hal_interface/aidl/a2dp/a2dp_encoding_aidl.h @@ -22,7 +22,6 @@ #include "a2dp_sbc_constants.h" #include "common/message_loop_thread.h" #include "hardware/bt_av.h" -#include "os/log.h" #include "osi/include/properties.h" #include "types/raw_address.h" diff --git a/system/audio_hal_interface/aidl/a2dp/a2dp_provider_info.cc b/system/audio_hal_interface/aidl/a2dp/a2dp_provider_info.cc index 9f4c86b2cf..074929290b 100644 --- a/system/audio_hal_interface/aidl/a2dp/a2dp_provider_info.cc +++ b/system/audio_hal_interface/aidl/a2dp/a2dp_provider_info.cc @@ -33,7 +33,6 @@ #include "a2dp_vendor_ldac_constants.h" #include "a2dp_vendor_opus_constants.h" #include "client_interface_aidl.h" -#include "os/log.h" namespace bluetooth::audio::aidl::a2dp { diff --git a/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc index 64f4d3d6e4..b6a761889b 100644 --- a/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc +++ b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc @@ -22,7 +22,6 @@ #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h" #include "client_interface_aidl.h" -#include "os/log.h" #include "osi/include/properties.h" namespace fmt { diff --git a/system/audio_hal_interface/aidl/le_audio_software_aidl.cc b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc index 8e3d8bfa03..7ba08289d0 100644 --- a/system/audio_hal_interface/aidl/le_audio_software_aidl.cc +++ b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc @@ -28,7 +28,6 @@ #include <vector> #include "hal_version_manager.h" -#include "os/log.h" namespace bluetooth { namespace audio { diff --git a/system/audio_hal_interface/hal_version_manager.cc b/system/audio_hal_interface/hal_version_manager.cc index 19c48c58da..2068b766e9 100644 --- a/system/audio_hal_interface/hal_version_manager.cc +++ b/system/audio_hal_interface/hal_version_manager.cc @@ -24,7 +24,6 @@ #include <memory> #include "aidl/audio_aidl_interfaces.h" -#include "os/log.h" namespace bluetooth { namespace audio { diff --git a/system/audio_hal_interface/hfp_client_interface.cc b/system/audio_hal_interface/hfp_client_interface.cc index 22e6b99373..9ff47a3490 100644 --- a/system/audio_hal_interface/hfp_client_interface.cc +++ b/system/audio_hal_interface/hfp_client_interface.cc @@ -24,7 +24,6 @@ #include "aidl/hfp_client_interface_aidl.h" #include "hal_version_manager.h" #include "hfp_client_interface.h" -#include "os/log.h" #include "osi/include/properties.h" using ::bluetooth::audio::aidl::hfp::HfpDecodingTransport; diff --git a/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc b/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc index 7f32ca7a2a..f80aac6b43 100644 --- a/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc +++ b/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc @@ -22,7 +22,6 @@ #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h" #include "client_interface_hidl.h" -#include "os/log.h" #include "osi/include/properties.h" namespace fmt { diff --git a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc index 94f8b8745b..740c05a0ad 100644 --- a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc +++ b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc @@ -21,8 +21,6 @@ #include <bluetooth/log.h> -#include "os/log.h" - namespace bluetooth { namespace audio { namespace hidl { diff --git a/system/audio_hal_interface/le_audio_software.cc b/system/audio_hal_interface/le_audio_software.cc index 7061f865e6..a984d966ee 100644 --- a/system/audio_hal_interface/le_audio_software.cc +++ b/system/audio_hal_interface/le_audio_software.cc @@ -31,7 +31,6 @@ #include "bta/le_audio/le_audio_types.h" #include "hal_version_manager.h" #include "hidl/le_audio_software_hidl.h" -#include "os/log.h" #include "osi/include/properties.h" namespace bluetooth { diff --git a/system/bta/ag/bta_ag_at.cc b/system/bta/ag/bta_ag_at.cc index 2a7a24022d..a42017c29b 100644 --- a/system/bta/ag/bta_ag_at.cc +++ b/system/bta/ag/bta_ag_at.cc @@ -34,7 +34,6 @@ #include "bta/ag/bta_ag_int.h" #include "bta/include/utl.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" using namespace bluetooth; diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h index 2173d86d62..21d39365a3 100644 --- a/system/bta/ag/bta_ag_int.h +++ b/system/bta/ag/bta_ag_int.h @@ -34,6 +34,7 @@ #include "bta/include/bta_api.h" #include "bta/sys/bta_sys.h" #include "internal_include/bt_target.h" +#include "os/logging/log_adapter.h" #include "stack/include/bt_hdr.h" #include "stack/include/btm_api_types.h" #include "stack/include/sdp_status.h" diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc index 2c349e4334..0d3b26a086 100644 --- a/system/bta/av/bta_av_api.cc +++ b/system/bta/av/bta_av_api.cc @@ -32,7 +32,6 @@ #include "btif/include/btif_av.h" #include "internal_include/bt_target.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "stack/include/bt_hdr.h" diff --git a/system/bta/av/bta_av_ci.cc b/system/bta/av/bta_av_ci.cc index 2fa1afb079..7a83c8570a 100644 --- a/system/bta/av/bta_av_ci.cc +++ b/system/bta/av/bta_av_ci.cc @@ -30,7 +30,6 @@ #include <bluetooth/log.h> #include "bta/av/bta_av_int.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/bta/av/bta_av_ssm.cc b/system/bta/av/bta_av_ssm.cc index 56c03a00cc..37df2021a2 100644 --- a/system/bta/av/bta_av_ssm.cc +++ b/system/bta/av/bta_av_ssm.cc @@ -28,7 +28,6 @@ #include "bta/av/bta_av_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" using namespace bluetooth; diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc index dfd93ca2dc..ca3bb38058 100644 --- a/system/bta/dm/bta_dm_pm.cc +++ b/system/bta/dm/bta_dm_pm.cc @@ -39,7 +39,6 @@ #include "hci/controller_interface.h" #include "main/shim/dumpsys.h" #include "main/shim/entry.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/acl_api.h" #include "stack/include/btm_client_interface.h" diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc index d4dfc500b1..38b3691b4a 100644 --- a/system/bta/gatt/bta_gattc_api.cc +++ b/system/bta/gatt/bta_gattc_api.cc @@ -34,7 +34,6 @@ #include "bta/gatt/bta_gattc_int.h" #include "gd/hci/uuid.h" #include "gd/os/rand.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" #include "stack/include/main_thread.h" diff --git a/system/bta/gatt/bta_gattc_db_storage.cc b/system/bta/gatt/bta_gattc_db_storage.cc index 6a741e8544..34beb0852c 100644 --- a/system/bta/gatt/bta_gattc_db_storage.cc +++ b/system/bta/gatt/bta_gattc_db_storage.cc @@ -28,7 +28,6 @@ #include "bta/gatt/bta_gattc_int.h" #include "gatt/database.h" -#include "os/log.h" #include "stack/include/gattdefs.h" #include "types/bluetooth/uuid.h" diff --git a/system/bta/gatt/bta_gattc_main.cc b/system/bta/gatt/bta_gattc_main.cc index fc642edfd4..2912879e77 100644 --- a/system/bta/gatt/bta_gattc_main.cc +++ b/system/bta/gatt/bta_gattc_main.cc @@ -28,7 +28,6 @@ #include "bta/gatt/bta_gattc_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "stack/include/bt_hdr.h" using base::StringPrintf; diff --git a/system/bta/gatt/bta_gattc_queue.cc b/system/bta/gatt/bta_gattc_queue.cc index 6d2cc8c887..40d99a7fb5 100644 --- a/system/bta/gatt/bta_gattc_queue.cc +++ b/system/bta/gatt/bta_gattc_queue.cc @@ -24,7 +24,6 @@ #include <vector> #include "bta_gatt_queue.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/eatt/eatt.h" diff --git a/system/bta/gatt/bta_gatts_queue.cc b/system/bta/gatt/bta_gatts_queue.cc index 1344f036f0..ef6a73e9d9 100644 --- a/system/bta/gatt/bta_gatts_queue.cc +++ b/system/bta/gatt/bta_gatts_queue.cc @@ -23,7 +23,6 @@ #include <unordered_set> #include "bta_gatt_server_queue.h" -#include "os/log.h" using gatts_operation = BtaGattServerQueue::gatts_operation; using bluetooth::Uuid; diff --git a/system/bta/gmap/gmap_client.cc b/system/bta/gmap/gmap_client.cc index 7cd8d8c054..917070e2ac 100644 --- a/system/bta/gmap/gmap_client.cc +++ b/system/bta/gmap/gmap_client.cc @@ -33,7 +33,6 @@ #include "gap_api.h" #include "gatt_api.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/bt_types.h" diff --git a/system/bta/gmap/gmap_server.cc b/system/bta/gmap/gmap_server.cc index deb0e9cb3c..6d5ca2cd47 100644 --- a/system/bta/gmap/gmap_server.cc +++ b/system/bta/gmap/gmap_server.cc @@ -38,7 +38,6 @@ #include "gd/os/rand.h" #include "include/hardware/bt_gmap.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "os/logging/log_adapter.h" #include "osi/include/properties.h" #include "stack/include/bt_types.h" diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc index 6992211a4f..bb9e354ec4 100644 --- a/system/bta/has/has_client.cc +++ b/system/bta/has/has_client.cc @@ -39,7 +39,6 @@ #include "gatt_api.h" #include "has_types.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/bt_types.h" diff --git a/system/bta/has/has_ctp.cc b/system/bta/has/has_ctp.cc index 080298fc9e..c39bef152a 100644 --- a/system/bta/has/has_ctp.cc +++ b/system/bta/has/has_ctp.cc @@ -19,7 +19,7 @@ #include <bluetooth/log.h> -#include "os/log.h" +#include "os/logging/log_adapter.h" #include "stack/include/bt_types.h" using namespace bluetooth; diff --git a/system/bta/hd/bta_hd_api.cc b/system/bta/hd/bta_hd_api.cc index 09c353b7df..3f5d3827a2 100644 --- a/system/bta/hd/bta_hd_api.cc +++ b/system/bta/hd/bta_hd_api.cc @@ -32,7 +32,6 @@ #include <bluetooth/log.h> #include "bta/hd/bta_hd_int.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "stack/include/bt_hdr.h" diff --git a/system/bta/hearing_aid/hearing_aid_audio_source.cc b/system/bta/hearing_aid/hearing_aid_audio_source.cc index 429bb4f0ce..ccc6708079 100644 --- a/system/bta/hearing_aid/hearing_aid_audio_source.cc +++ b/system/bta/hearing_aid/hearing_aid_audio_source.cc @@ -29,7 +29,6 @@ #include "bta/include/bta_hearing_aid_api.h" #include "common/repeating_timer.h" #include "common/time_util.h" -#include "os/log.h" #include "osi/include/wakelock.h" #include "stack/include/main_thread.h" #include "udrv/include/uipc.h" diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc index 9be68cab97..883d0f0955 100644 --- a/system/bta/hf_client/bta_hf_client_at.cc +++ b/system/bta/hf_client/bta_hf_client_at.cc @@ -23,7 +23,6 @@ #include "bta/hf_client/bta_hf_client_int.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/properties.h" diff --git a/system/bta/hf_client/bta_hf_client_sdp.cc b/system/bta/hf_client/bta_hf_client_sdp.cc index a9dc87489c..94ebd87917 100644 --- a/system/bta/hf_client/bta_hf_client_sdp.cc +++ b/system/bta/hf_client/bta_hf_client_sdp.cc @@ -33,7 +33,6 @@ #include "bta/include/bta_rfcomm_scn.h" #include "bta/sys/bta_sys.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_types.h" #include "stack/include/bt_uuid16.h" diff --git a/system/bta/hh/bta_hh_api.cc b/system/bta/hh/bta_hh_api.cc index 10ca7f2d65..413eeb9b6d 100644 --- a/system/bta/hh/bta_hh_api.cc +++ b/system/bta/hh/bta_hh_api.cc @@ -30,7 +30,6 @@ #include "bta/hh/bta_hh_int.h" #include "bta/sys/bta_sys.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" #include "stack/include/main_thread.h" diff --git a/system/bta/hh/bta_hh_main.cc b/system/bta/hh/bta_hh_main.cc index a4dd1444b4..1601663573 100644 --- a/system/bta/hh/bta_hh_main.cc +++ b/system/bta/hh/bta_hh_main.cc @@ -31,7 +31,6 @@ #include "bta/hh/bta_hh_int.h" #include "main/shim/dumpsys.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc index c163c1e5ab..b5b86cf94d 100644 --- a/system/bta/hh/bta_hh_utils.cc +++ b/system/bta/hh/bta_hh_utils.cc @@ -26,7 +26,6 @@ #include "btif/include/btif_storage.h" #include "device/include/interop.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/btm_client_interface.h" #include "stack/include/btm_status.h" diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h index 43f5fc1d72..8772fe183c 100644 --- a/system/bta/include/bta_api.h +++ b/system/bta/include/bta_api.h @@ -35,7 +35,6 @@ #include "bta_api_data_types.h" #include "hci/le_rand_callback.h" #include "macros.h" -#include "os/log.h" #include "stack/btm/btm_eir.h" #include "stack/btm/power_mode.h" #include "stack/include/bt_dev_class.h" diff --git a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc index 8f05b7248b..2f86a94e5b 100644 --- a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc +++ b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc @@ -24,7 +24,6 @@ #include "audio_hal_interface/le_audio_software.h" #include "bta/le_audio/codec_manager.h" #include "common/time_util.h" -#include "os/log.h" #include "osi/include/wakelock.h" #include "stack/include/main_thread.h" diff --git a/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc b/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc index b721d4546d..bd7c8bea85 100644 --- a/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc +++ b/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc @@ -30,7 +30,6 @@ #include "common/repeating_timer.h" #include "common/time_util.h" #include "gd/hal/link_clocker.h" -#include "os/log.h" #include "osi/include/wakelock.h" #include "stack/include/main_thread.h" diff --git a/system/bta/le_audio/broadcaster/state_machine.cc b/system/bta/le_audio/broadcaster/state_machine.cc index 07c258683a..d81011b655 100644 --- a/system/bta/le_audio/broadcaster/state_machine.cc +++ b/system/bta/le_audio/broadcaster/state_machine.cc @@ -30,7 +30,6 @@ #include "bta/le_audio/le_audio_types.h" #include "common/strings.h" #include "hci/le_advertising_manager.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/btm_iso_api.h" diff --git a/system/bta/le_audio/client_parser.cc b/system/bta/le_audio/client_parser.cc index f3b3b66925..9de6734bc7 100644 --- a/system/bta/le_audio/client_parser.cc +++ b/system/bta/le_audio/client_parser.cc @@ -33,7 +33,6 @@ #include "internal_include/bt_trace.h" #include "le_audio_types.h" #include "le_audio_utils.h" -#include "os/log.h" #include "stack/include/bt_types.h" using bluetooth::le_audio::types::acs_ac_record; diff --git a/system/bta/le_audio/codec_interface.cc b/system/bta/le_audio/codec_interface.cc index b5c75c6e1c..637c77f5bf 100644 --- a/system/bta/le_audio/codec_interface.cc +++ b/system/bta/le_audio/codec_interface.cc @@ -25,8 +25,6 @@ #include <optional> #include <vector> -#include "os/log.h" - namespace bluetooth::le_audio { struct CodecInterface::Impl { diff --git a/system/bta/le_audio/codec_manager.cc b/system/bta/le_audio/codec_manager.cc index fce821417d..d4b0fe0efc 100644 --- a/system/bta/le_audio/codec_manager.cc +++ b/system/bta/le_audio/codec_manager.cc @@ -31,7 +31,6 @@ #include "le_audio_set_configuration_provider.h" #include "le_audio_utils.h" #include "main/shim/entry.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/hcimsgs.h" diff --git a/system/bta/le_audio/content_control_id_keeper.cc b/system/bta/le_audio/content_control_id_keeper.cc index cfda2dedc2..f4ca933f06 100644 --- a/system/bta/le_audio/content_control_id_keeper.cc +++ b/system/bta/le_audio/content_control_id_keeper.cc @@ -24,7 +24,6 @@ #include "common/strings.h" #include "le_audio_types.h" -#include "os/log.h" namespace { diff --git a/system/bta/le_audio/devices.h b/system/bta/le_audio/devices.h index 1f972aae85..0707bae4b4 100644 --- a/system/bta/le_audio/devices.h +++ b/system/bta/le_audio/devices.h @@ -26,7 +26,6 @@ #include "gatt_api.h" #include "gmap_client.h" #include "le_audio_types.h" -#include "os/log.h" #include "osi/include/alarm.h" #include "raw_address.h" diff --git a/system/bta/le_audio/devices_test.cc b/system/bta/le_audio/devices_test.cc index 1ad0684ce6..11480961b8 100644 --- a/system/bta/le_audio/devices_test.cc +++ b/system/bta/le_audio/devices_test.cc @@ -32,7 +32,6 @@ #include "le_audio_types.h" #include "mock_codec_manager.h" #include "mock_csis_client.h" -#include "os/log.h" #include "stack/btm/btm_int_types.h" #include "test/mock/mock_main_shim_entry.h" diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc index 3b349e8179..5a2c2feb92 100644 --- a/system/bta/le_audio/le_audio_health_status.cc +++ b/system/bta/le_audio/le_audio_health_status.cc @@ -23,7 +23,6 @@ #include "bta/include/bta_groups.h" #include "common/strings.h" #include "main/shim/metrics_api.h" -#include "os/log.h" #include "osi/include/properties.h" using bluetooth::common::ToString; diff --git a/system/bta/le_audio/le_audio_log_history.cc b/system/bta/le_audio/le_audio_log_history.cc index 0022d7b7da..22fd939994 100644 --- a/system/bta/le_audio/le_audio_log_history.cc +++ b/system/bta/le_audio/le_audio_log_history.cc @@ -25,7 +25,7 @@ #include "common/circular_buffer.h" #include "common/strings.h" #include "main/shim/dumpsys.h" -#include "os/log.h" +#include "os/logging/log_adapter.h" #include "osi/include/osi.h" #include "osi/include/properties.h" diff --git a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc index 169943323c..3b8643152d 100644 --- a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc +++ b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc @@ -29,7 +29,6 @@ #include "flatbuffers/util.h" #include "le_audio/le_audio_types.h" #include "le_audio_set_configuration_provider.h" -#include "os/log.h" #include "osi/include/osi.h" #include "osi/include/properties.h" diff --git a/system/bta/le_audio/le_audio_utils.cc b/system/bta/le_audio/le_audio_utils.cc index 2e29fd1e03..719d017607 100644 --- a/system/bta/le_audio/le_audio_utils.cc +++ b/system/bta/le_audio/le_audio_utils.cc @@ -20,7 +20,6 @@ #include "common/strings.h" #include "le_audio_types.h" -#include "os/log.h" using bluetooth::common::ToString; using bluetooth::le_audio::types::AudioContexts; diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc index b9f24233c3..916c8249b1 100644 --- a/system/bta/le_audio/storage_helper.cc +++ b/system/bta/le_audio/storage_helper.cc @@ -23,7 +23,6 @@ #include "client_parser.h" #include "common/strings.h" #include "le_audio_types.h" -#include "os/log.h" #include "stack/include/bt_types.h" // TODO(b/369381361) Enfore -Wmissing-prototypes diff --git a/system/bta/ras/ras_utils.cc b/system/bta/ras/ras_utils.cc index d27a6bf697..2a9b3b9c88 100644 --- a/system/bta/ras/ras_utils.cc +++ b/system/bta/ras/ras_utils.cc @@ -21,7 +21,6 @@ #include "bta/include/bta_gatt_api.h" #include "bta/include/bta_ras_api.h" #include "bta/ras/ras_types.h" -#include "os/log.h" #include "stack/include/bt_types.h" #include "stack/include/btm_ble_addr.h" #include "stack/include/gap_api.h" diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc index 4e5ad74d52..524f750ff7 100644 --- a/system/bta/sys/bta_sys_main.cc +++ b/system/bta/sys/bta_sys_main.cc @@ -33,7 +33,6 @@ #include "bta/sys/bta_sys_int.h" #include "include/hardware/bluetooth.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/bta/vc/device.cc b/system/bta/vc/device.cc index ec2088981e..f4f016f2d9 100644 --- a/system/bta/vc/device.cc +++ b/system/bta/vc/device.cc @@ -25,7 +25,6 @@ #include "bta/include/bta_gatt_queue.h" #include "bta/vc/devices.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "os/logging/log_adapter.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_types.h" diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc index 6a449c74c3..2c415a59c0 100644 --- a/system/bta/vc/vc.cc +++ b/system/bta/vc/vc.cc @@ -33,7 +33,6 @@ #include "bta/le_audio/le_audio_types.h" #include "bta/vc/devices.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/osi.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_types.h" diff --git a/system/btcore/src/module.cc b/system/btcore/src/module.cc index 3f809d4d5d..ec34b32636 100644 --- a/system/btcore/src/module.cc +++ b/system/btcore/src/module.cc @@ -28,7 +28,6 @@ #include <unordered_map> #include "common/message_loop_thread.h" -#include "os/log.h" using bluetooth::common::MessageLoopThread; using namespace bluetooth; diff --git a/system/btcore/src/osi_module.cc b/system/btcore/src/osi_module.cc index 22d8f05398..638748fe03 100644 --- a/system/btcore/src/osi_module.cc +++ b/system/btcore/src/osi_module.cc @@ -21,7 +21,6 @@ #include "btcore/include/osi_module.h" #include "btcore/include/module.h" -#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/future.h" #include "osi/include/osi.h" diff --git a/system/btif/co/bta_pan_co.cc b/system/btif/co/bta_pan_co.cc index bdc0ac397b..db84d8bd34 100644 --- a/system/btif/co/bta_pan_co.cc +++ b/system/btif/co/bta_pan_co.cc @@ -36,7 +36,6 @@ #include "btif_pan_internal.h" #include "btif_sock_thread.h" #include "btif_util.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "pan_api.h" #include "stack/include/bt_hdr.h" diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h index 64433579f0..109dd49893 100644 --- a/system/btif/include/btif_common.h +++ b/system/btif/include/btif_common.h @@ -30,7 +30,6 @@ #include "abstract_message_loop.h" #include "bta/include/bta_api.h" -#include "os/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" #include "types/raw_address.h" diff --git a/system/btif/src/btif_av.cc b/system/btif/src/btif_av.cc index c62d54c281..2132172e48 100644 --- a/system/btif/src/btif_av.cc +++ b/system/btif/src/btif_av.cc @@ -52,6 +52,7 @@ #include "device/include/device_iot_config.h" #include "hardware/bt_av.h" #include "include/hardware/bt_rc.h" +#include "os/logging/log_adapter.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" #include "osi/include/properties.h" diff --git a/system/btif/src/btif_profile_queue.cc b/system/btif/src/btif_profile_queue.cc index b640c70d02..15237abe75 100644 --- a/system/btif/src/btif_profile_queue.cc +++ b/system/btif/src/btif_profile_queue.cc @@ -30,7 +30,6 @@ #include <base/functional/bind.h> #include <base/functional/callback.h> -#include <base/strings/stringprintf.h> #include <bluetooth/log.h> #include <string.h> @@ -53,8 +52,7 @@ public: : address_(address), uuid_(uuid), busy_(false), connect_cb_(connect_cb) {} std::string ToString() const { - return base::StringPrintf("address=%s UUID=%04X busy=%s", ADDRESS_TO_LOGGABLE_CSTR(address_), - uuid_, (busy_) ? "true" : "false"); + return fmt::format("address={} UUID={:04X} busy={}", address_, uuid_, busy_); } const RawAddress& address() const { return address_; } diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc index a059d5a05f..cf244403b1 100644 --- a/system/btif/src/btif_rc.cc +++ b/system/btif/src/btif_rc.cc @@ -44,6 +44,7 @@ #include "btif_common.h" #include "btif_util.h" #include "device/include/interop.h" +#include "os/logging/log_adapter.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" #include "osi/include/list.h" diff --git a/system/common/base_bind_unittest.cc b/system/common/base_bind_unittest.cc index d31ea01642..b4f35f53e4 100644 --- a/system/common/base_bind_unittest.cc +++ b/system/common/base_bind_unittest.cc @@ -24,8 +24,6 @@ #include <memory> #include <mutex> -#include "os/log.h" - class BaseBindThreadTest : public ::testing::Test { public: protected: diff --git a/system/device/src/device_iot_config.cc b/system/device/src/device_iot_config.cc index 0918a54f7b..2da612ac47 100644 --- a/system/device/src/device_iot_config.cc +++ b/system/device/src/device_iot_config.cc @@ -32,7 +32,6 @@ #include "device_iot_config_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" diff --git a/system/device/src/device_iot_config_int.cc b/system/device/src/device_iot_config_int.cc index 60f2d884bd..33b5f8106d 100644 --- a/system/device/src/device_iot_config_int.cc +++ b/system/device/src/device_iot_config_int.cc @@ -32,7 +32,6 @@ #include "btcore/include/module.h" #include "btif/include/btif_common.h" #include "device/include/device_iot_config.h" -#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/config.h" #include "osi/include/future.h" diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc index 78b1b70b34..c45031a7b0 100644 --- a/system/device/src/interop.cc +++ b/system/device/src/interop.cc @@ -40,7 +40,6 @@ #include "btif/include/btif_storage.h" #include "device/include/interop_config.h" #include "device/include/interop_database.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/config.h" diff --git a/system/gd/common/audit_log.cc b/system/gd/common/audit_log.cc index 74be6f25c9..5897c70aac 100644 --- a/system/gd/common/audit_log.cc +++ b/system/gd/common/audit_log.cc @@ -16,9 +16,12 @@ #include "common/audit_log.h" +#ifdef __ANDROID__ +#include <log/log_event_list.h> +#endif // __ANDROID__ + #include "common/strings.h" #include "hci/hci_packets.h" -#include "os/log.h" namespace { #if defined(__ANDROID__) && !defined(FUZZ_TARGET) diff --git a/system/gd/common/byte_array_test.cc b/system/gd/common/byte_array_test.cc index 4798faccf0..b9a64b3882 100644 --- a/system/gd/common/byte_array_test.cc +++ b/system/gd/common/byte_array_test.cc @@ -18,8 +18,6 @@ #include <gtest/gtest.h> -#include "os/log.h" - using bluetooth::common::ByteArray; namespace { diff --git a/system/gd/common/circular_buffer_test.cc b/system/gd/common/circular_buffer_test.cc index 577bb6681b..e35a60c98e 100644 --- a/system/gd/common/circular_buffer_test.cc +++ b/system/gd/common/circular_buffer_test.cc @@ -22,8 +22,6 @@ #include <limits> #include <string> -#include "os/log.h" - namespace testing { long long timestamp_{0}; diff --git a/system/gd/common/lru_cache.h b/system/gd/common/lru_cache.h index 75b104f268..303688d55f 100644 --- a/system/gd/common/lru_cache.h +++ b/system/gd/common/lru_cache.h @@ -27,7 +27,6 @@ #include <unordered_map> #include "common/list_map.h" -#include "os/log.h" namespace bluetooth { namespace common { diff --git a/system/gd/common/metric_id_manager.cc b/system/gd/common/metric_id_manager.cc index 84268dba1d..131b09402c 100644 --- a/system/gd/common/metric_id_manager.cc +++ b/system/gd/common/metric_id_manager.cc @@ -27,8 +27,6 @@ #include <optional> #include <thread> -#include "os/log.h" - namespace bluetooth { namespace common { diff --git a/system/gd/common/strings.h b/system/gd/common/strings.h index ed5af390aa..5593715eb2 100644 --- a/system/gd/common/strings.h +++ b/system/gd/common/strings.h @@ -32,7 +32,6 @@ #include <vector> #include "common/type_helper.h" -#include "os/log.h" namespace bluetooth { namespace common { diff --git a/system/gd/common/sync_map_count_test.cc b/system/gd/common/sync_map_count_test.cc index 189e6f47c6..0e29c32467 100644 --- a/system/gd/common/sync_map_count_test.cc +++ b/system/gd/common/sync_map_count_test.cc @@ -23,8 +23,6 @@ #include <cstring> #include <vector> -#include "os/log.h" - namespace testing { const char* data[] = { diff --git a/system/gd/docs/architecture/style_guide.md b/system/gd/docs/architecture/style_guide.md index bdc5657f9a..8882982396 100644 --- a/system/gd/docs/architecture/style_guide.md +++ b/system/gd/docs/architecture/style_guide.md @@ -186,24 +186,3 @@ only symbols that should be exposed are: * A header library to all exposed API service to profiles and layers * An entry point to a certification interface, libbluetooth\_certification.so * A header library to this certification stack - -## Logging - -Gabeldorsche uses `printf` style logging with macros defined in `os/log.h`. Five -log levels are available. - -* LOG_VERBOSE(fmt, args...): Will be disabled by default -* LOG_INFO(fmt, args...): Will be disabled by default -* LOG_INFO(fmt, args...): Enabled -* LOG_WARN(fmt, args...): Enabled -* LOG_ERROR(fmt, args...): Enabled -* LOG_ALWAYS_FATAL(fmt, args...): Enabled, will always crash -* ASSERT(condition): Enabled, will crash when condition is false -* ASSERT_LOG(conditon, fmt, args...): Enabled, will crash and print log when - condition is false - -In general, errors that are caused by remote device should never crash our stack -and should be logged using LOG_WARN() only. Recoverable errors due to our stack -or badly behaved bluetooth controller firmware should be logged using -LOG_ERROR() before recovery. Non-recoverable errors should be logged as -LOG_ALWAYS_FATAL() to crash the stack and restart. diff --git a/system/gd/docs/testing/gtest.md b/system/gd/docs/testing/gtest.md index 5120250a22..9ec38f8215 100644 --- a/system/gd/docs/testing/gtest.md +++ b/system/gd/docs/testing/gtest.md @@ -134,7 +134,6 @@ Note: All paths are relative to #include "l2cap/internal/channel_impl.h" #include "l2cap/l2cap_packets.h" #include "os/handler.h" -#include "os/log.h" namespace bluetooth { namespace l2cap { diff --git a/system/gd/dumpsys/internal/filter_internal.cc b/system/gd/dumpsys/internal/filter_internal.cc index a26c56383f..2db2878f95 100644 --- a/system/gd/dumpsys/internal/filter_internal.cc +++ b/system/gd/dumpsys/internal/filter_internal.cc @@ -23,7 +23,6 @@ #include "flatbuffers/flatbuffers.h" #include "flatbuffers/idl.h" -#include "os/log.h" #define DBG 0 diff --git a/system/gd/dumpsys/internal/filter_internal_test.cc b/system/gd/dumpsys/internal/filter_internal_test.cc index 2db4b2d007..38f3481f0c 100644 --- a/system/gd/dumpsys/internal/filter_internal_test.cc +++ b/system/gd/dumpsys/internal/filter_internal_test.cc @@ -27,7 +27,6 @@ #include "dumpsys/internal/test_data/string_generated.h" #include "dumpsys/internal/test_data/struct_bfbs.h" #include "dumpsys/internal/test_data/struct_generated.h" -#include "os/log.h" namespace testing { diff --git a/system/gd/dumpsys/reflection_schema.cc b/system/gd/dumpsys/reflection_schema.cc index 3ab9fc2803..b2d79313eb 100644 --- a/system/gd/dumpsys/reflection_schema.cc +++ b/system/gd/dumpsys/reflection_schema.cc @@ -23,7 +23,6 @@ #include "bundler_schema_generated.h" #include "flatbuffers/flatbuffers.h" #include "flatbuffers/idl.h" -#include "os/log.h" using namespace bluetooth; diff --git a/system/gd/facade/grpc_root_server.cc b/system/gd/facade/grpc_root_server.cc index 886e6d9b30..8e3bfb3f3f 100644 --- a/system/gd/facade/grpc_root_server.cc +++ b/system/gd/facade/grpc_root_server.cc @@ -30,7 +30,6 @@ #include "hci/facade/le_initiator_address_facade.h" #include "hci/facade/le_scanning_manager_facade.h" #include "neighbor/facade/facade.h" -#include "os/log.h" #include "os/thread.h" #include "stack_manager.h" diff --git a/system/gd/grpc/grpc_event_queue.h b/system/gd/grpc/grpc_event_queue.h index c181573ab1..c7f8c87314 100644 --- a/system/gd/grpc/grpc_event_queue.h +++ b/system/gd/grpc/grpc_event_queue.h @@ -25,7 +25,6 @@ #include "blueberry/facade/common.pb.h" #include "common/blocking_queue.h" -#include "os/log.h" namespace bluetooth { namespace grpc { diff --git a/system/gd/grpc/grpc_module.cc b/system/gd/grpc/grpc_module.cc index 93979f533e..53b40f8035 100644 --- a/system/gd/grpc/grpc_module.cc +++ b/system/gd/grpc/grpc_module.cc @@ -18,8 +18,6 @@ #include <bluetooth/log.h> -#include "os/log.h" - using ::grpc::Server; using ::grpc::ServerBuilder; diff --git a/system/gd/hal/hci_hal_host.cc b/system/gd/hal/hci_hal_host.cc index c6bba6968a..79e1cabd85 100644 --- a/system/gd/hal/hci_hal_host.cc +++ b/system/gd/hal/hci_hal_host.cc @@ -37,7 +37,6 @@ #include "hal/mgmt.h" #include "hal/snoop_logger.h" #include "metrics/counter_metrics.h" -#include "os/log.h" #include "os/reactor.h" #include "os/thread.h" diff --git a/system/gd/hal/hci_hal_host_rootcanal.cc b/system/gd/hal/hci_hal_host_rootcanal.cc index 26ffa84894..05d898228d 100644 --- a/system/gd/hal/hci_hal_host_rootcanal.cc +++ b/system/gd/hal/hci_hal_host_rootcanal.cc @@ -31,7 +31,6 @@ #include "hal/hci_hal_host.h" #include "hal/snoop_logger.h" #include "metrics/counter_metrics.h" -#include "os/log.h" #include "os/reactor.h" #include "os/thread.h" diff --git a/system/gd/hal/hci_hal_host_test.cc b/system/gd/hal/hci_hal_host_test.cc index 14c689738e..ab0ccef8f6 100644 --- a/system/gd/hal/hci_hal_host_test.cc +++ b/system/gd/hal/hci_hal_host_test.cc @@ -34,7 +34,6 @@ #include "hal/hci_hal.h" #include "hal/serialize_packet.h" -#include "os/log.h" #include "os/thread.h" #include "os/utils.h" #include "packet/raw_builder.h" diff --git a/system/gd/hal/mgmt.cc b/system/gd/hal/mgmt.cc index dd2e0bca6e..c5de32c3f7 100644 --- a/system/gd/hal/mgmt.cc +++ b/system/gd/hal/mgmt.cc @@ -30,8 +30,6 @@ #include <cerrno> -#include "os/log.h" - extern int GetAdapterIndex(); namespace bluetooth { diff --git a/system/gd/hal/ranging_hal_android.cc b/system/gd/hal/ranging_hal_android.cc index 658b7d777b..893a25fd10 100644 --- a/system/gd/hal/ranging_hal_android.cc +++ b/system/gd/hal/ranging_hal_android.cc @@ -23,7 +23,7 @@ #include <unordered_map> -// AIDL uses syslog.h, so these defines conflict with os/log.h +// AIDL uses syslog.h, so these defines conflict with log/log.h #undef LOG_DEBUG #undef LOG_INFO #undef LOG_WARNING diff --git a/system/gd/hal/ranging_hal_host.cc b/system/gd/hal/ranging_hal_host.cc index 16e44995b6..36c821f419 100644 --- a/system/gd/hal/ranging_hal_host.cc +++ b/system/gd/hal/ranging_hal_host.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -// AIDL uses syslog.h, so these defines conflict with os/log.h +// AIDL uses syslog.h, so these defines conflict with log/log.h #undef LOG_DEBUG #undef LOG_INFO #undef LOG_WARNING diff --git a/system/gd/hci/acl_manager/assembler.h b/system/gd/hci/acl_manager/assembler.h index 147cc7a99e..d126a980a2 100644 --- a/system/gd/hci/acl_manager/assembler.h +++ b/system/gd/hci/acl_manager/assembler.h @@ -26,7 +26,6 @@ #include "hci/acl_manager/acl_connection.h" #include "hci/address_with_type.h" #include "os/handler.h" -#include "os/log.h" #include "packet/packet_view.h" namespace bluetooth { diff --git a/system/gd/hci/acl_manager/classic_acl_connection_test.cc b/system/gd/hci/acl_manager/classic_acl_connection_test.cc index 8cc66ab807..97ee9fc4af 100644 --- a/system/gd/hci/acl_manager/classic_acl_connection_test.cc +++ b/system/gd/hci/acl_manager/classic_acl_connection_test.cc @@ -33,7 +33,6 @@ #include "hci/address.h" #include "hci/hci_packets.h" #include "os/handler.h" -#include "os/log.h" #include "os/thread.h" using namespace bluetooth; diff --git a/system/gd/hci/acl_manager/round_robin_scheduler_test.cc b/system/gd/hci/acl_manager/round_robin_scheduler_test.cc index 210cc71125..f019bf8fe1 100644 --- a/system/gd/hci/acl_manager/round_robin_scheduler_test.cc +++ b/system/gd/hci/acl_manager/round_robin_scheduler_test.cc @@ -23,7 +23,6 @@ #include "hci/controller.h" #include "hci/hci_packets.h" #include "os/handler.h" -#include "os/log.h" #include "packet/raw_builder.h" using ::bluetooth::common::BidiQueue; diff --git a/system/gd/hci/distance_measurement_manager.cc b/system/gd/hci/distance_measurement_manager.cc index b5761e7afa..78b5a5bfd4 100644 --- a/system/gd/hci/distance_measurement_manager.cc +++ b/system/gd/hci/distance_measurement_manager.cc @@ -32,7 +32,6 @@ #include "hci/hci_layer.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" #include "os/repeating_alarm.h" #include "packet/packet_view.h" #include "ras/ras_packets.h" diff --git a/system/gd/hci/event_checkers.h b/system/gd/hci/event_checkers.h index 41aca0718f..a484f5752e 100644 --- a/system/gd/hci/event_checkers.h +++ b/system/gd/hci/event_checkers.h @@ -19,7 +19,6 @@ #include <bluetooth/log.h> #include "hci/hci_packets.h" -#include "os/log.h" namespace bluetooth { namespace hci { diff --git a/system/gd/hci/facade/le_advertising_manager_facade.cc b/system/gd/hci/facade/le_advertising_manager_facade.cc index 43b68aedf5..d9c6cca0d8 100644 --- a/system/gd/hci/facade/le_advertising_manager_facade.cc +++ b/system/gd/hci/facade/le_advertising_manager_facade.cc @@ -31,7 +31,6 @@ #include "hci/address.h" #include "hci/address_with_type.h" #include "hci/le_advertising_manager.h" -#include "os/log.h" // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/gd/hci/facade/le_scanning_manager_facade.cc b/system/gd/hci/facade/le_scanning_manager_facade.cc index 8a2e7f90ee..243b46ff4e 100644 --- a/system/gd/hci/facade/le_scanning_manager_facade.cc +++ b/system/gd/hci/facade/le_scanning_manager_facade.cc @@ -28,7 +28,6 @@ #include "common/bind.h" #include "grpc/grpc_event_queue.h" #include "hci/le_scanning_manager.h" -#include "os/log.h" #include "packet/raw_builder.h" namespace bluetooth { diff --git a/system/gd/hci/fuzz/acl_manager_fuzz_test.cc b/system/gd/hci/fuzz/acl_manager_fuzz_test.cc index 527982ced5..06544789b7 100644 --- a/system/gd/hci/fuzz/acl_manager_fuzz_test.cc +++ b/system/gd/hci/fuzz/acl_manager_fuzz_test.cc @@ -24,7 +24,6 @@ #include "hci/hci_layer.h" #include "module.h" #include "os/fake_timer/fake_timerfd.h" -#include "os/log.h" // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/gd/hci/fuzz/fuzz_hci_layer.h b/system/gd/hci/fuzz/fuzz_hci_layer.h index 07a58fdc74..10492cdda9 100644 --- a/system/gd/hci/fuzz/fuzz_hci_layer.h +++ b/system/gd/hci/fuzz/fuzz_hci_layer.h @@ -26,7 +26,6 @@ #include "hci/hci_layer.h" #include "os/fuzz/dev_null_queue.h" #include "os/fuzz/fuzz_inject_queue.h" -#include "os/log.h" namespace bluetooth { namespace hci { diff --git a/system/gd/hci/fuzz/hci_layer_fuzz_test.cc b/system/gd/hci/fuzz/hci_layer_fuzz_test.cc index 48191efe1c..392ffdd3e6 100644 --- a/system/gd/hci/fuzz/hci_layer_fuzz_test.cc +++ b/system/gd/hci/fuzz/hci_layer_fuzz_test.cc @@ -24,7 +24,6 @@ #include "hci/hci_layer.h" #include "module.h" #include "os/fake_timer/fake_timerfd.h" -#include "os/log.h" // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/gd/hci/hci_layer_test.cc b/system/gd/hci/hci_layer_test.cc index 9f8d9ead3c..1f677d518b 100644 --- a/system/gd/hci/hci_layer_test.cc +++ b/system/gd/hci/hci_layer_test.cc @@ -24,7 +24,6 @@ #include "hal/hci_hal_fake.h" #include "hci/hci_packets.h" #include "module.h" -#include "os/log.h" #include "os/thread.h" #include "packet/bit_inserter.h" #include "packet/raw_builder.h" diff --git a/system/gd/hci/hci_packets_fuzz_test.cc b/system/gd/hci/hci_packets_fuzz_test.cc index 68ebf7e6da..2868477c46 100644 --- a/system/gd/hci/hci_packets_fuzz_test.cc +++ b/system/gd/hci/hci_packets_fuzz_test.cc @@ -18,7 +18,6 @@ #include <memory> #include "hci/hci_packets.h" -#include "os/log.h" #include "packet/bit_inserter.h" #include "packet/raw_builder.h" diff --git a/system/gd/hci/hci_packets_test.cc b/system/gd/hci/hci_packets_test.cc index 9df54187bb..01121c7922 100644 --- a/system/gd/hci/hci_packets_test.cc +++ b/system/gd/hci/hci_packets_test.cc @@ -20,7 +20,6 @@ #define PACKET_TESTING // Instantiate the tests in the packet files #include "hci/hci_packets.h" -#include "os/log.h" #include "packet/bit_inserter.h" #include "packet/raw_builder.h" diff --git a/system/gd/hci/le_scanning_manager.cc b/system/gd/hci/le_scanning_manager.cc index 4ade641f93..6c9e9744b4 100644 --- a/system/gd/hci/le_scanning_manager.cc +++ b/system/gd/hci/le_scanning_manager.cc @@ -31,7 +31,6 @@ #include "hci/le_scanning_reassembler.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" #include "os/system_properties.h" #include "storage/storage_module.h" diff --git a/system/gd/hci/le_scanning_reassembler.cc b/system/gd/hci/le_scanning_reassembler.cc index c3199221a3..8f8ad06b00 100644 --- a/system/gd/hci/le_scanning_reassembler.cc +++ b/system/gd/hci/le_scanning_reassembler.cc @@ -28,7 +28,6 @@ #include "hci/le_scanning_interface.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" #include "storage/storage_module.h" namespace bluetooth::hci { diff --git a/system/gd/metrics/chromeos/metrics.cc b/system/gd/metrics/chromeos/metrics.cc index fbe7afcba3..9a7541735a 100644 --- a/system/gd/metrics/chromeos/metrics.cc +++ b/system/gd/metrics/chromeos/metrics.cc @@ -24,7 +24,6 @@ #include "metrics/chromeos/metrics_allowlist.h" #include "metrics/chromeos/metrics_event.h" #include "metrics/utils.h" -#include "os/log.h" namespace bluetooth { namespace metrics { diff --git a/system/gd/metrics/counter_metrics.cc b/system/gd/metrics/counter_metrics.cc index 0155eb1bd0..1315a87df1 100644 --- a/system/gd/metrics/counter_metrics.cc +++ b/system/gd/metrics/counter_metrics.cc @@ -20,7 +20,6 @@ #include <bluetooth/log.h> #include "common/bind.h" -#include "os/log.h" #include "os/metrics.h" namespace bluetooth { diff --git a/system/gd/module.h b/system/gd/module.h index 14c81ccaf4..44aa0bcb29 100644 --- a/system/gd/module.h +++ b/system/gd/module.h @@ -30,7 +30,6 @@ #include "common/bind.h" #include "os/handler.h" -#include "os/log.h" #include "os/thread.h" namespace bluetooth { diff --git a/system/gd/neighbor/name_db.cc b/system/gd/neighbor/name_db.cc index 99eca8d0e1..48cdae4705 100644 --- a/system/gd/neighbor/name_db.cc +++ b/system/gd/neighbor/name_db.cc @@ -28,7 +28,6 @@ #include "hci/remote_name_request.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" namespace bluetooth { namespace neighbor { diff --git a/system/gd/neighbor/scan.cc b/system/gd/neighbor/scan.cc index fafb316b33..8559f338da 100644 --- a/system/gd/neighbor/scan.cc +++ b/system/gd/neighbor/scan.cc @@ -25,7 +25,6 @@ #include "hci/hci_packets.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" namespace bluetooth { namespace neighbor { diff --git a/system/gd/os/android/metrics.cc b/system/gd/os/android/metrics.cc index daea83d0a5..0a2dbd92b6 100644 --- a/system/gd/os/android/metrics.cc +++ b/system/gd/os/android/metrics.cc @@ -30,7 +30,6 @@ #include "common/strings.h" #include "hardware/bt_av.h" #include "hci/hci_packets.h" -#include "os/log.h" namespace fmt { template <> diff --git a/system/gd/os/android/system_properties.cc b/system/gd/os/android/system_properties.cc index d7dc9e918a..d0f2707173 100644 --- a/system/gd/os/android/system_properties.cc +++ b/system/gd/os/android/system_properties.cc @@ -23,7 +23,6 @@ #include <cctype> #include "common/strings.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/android/wakelock_native.cc b/system/gd/os/android/wakelock_native.cc index d34fa94cab..bc7d2ae130 100644 --- a/system/gd/os/android/wakelock_native.cc +++ b/system/gd/os/android/wakelock_native.cc @@ -32,20 +32,6 @@ #include <functional> #include <string> -// We want the os/log.h definitions -#undef LOG_DEBUG -#undef LOG_INFO - -#include "os/log.h" - -// Save the os/log.h definitions -#pragma push_macro("LOG_DEBUG") -#pragma push_macro("LOG_INFO") - -// Undef these to avoid conflicting with later imports -#undef LOG_DEBUG -#undef LOG_INFO - using ::aidl::android::system::suspend::ISystemSuspend; using ::aidl::android::system::suspend::IWakeLock; using ::aidl::android::system::suspend::WakeLockType; @@ -54,10 +40,6 @@ namespace bluetooth { namespace os { namespace internal { -// Restore the os/log.h definitions after all imported headers -#pragma pop_macro("LOG_DEBUG") -#pragma pop_macro("LOG_INFO") - static void onSuspendDeath(void* cookie) { auto onDeath = static_cast<std::function<void(void)>*>(cookie); (*onDeath)(); diff --git a/system/gd/os/chromeos/metrics.cc b/system/gd/os/chromeos/metrics.cc index 2ec46c8c55..b3795341f2 100644 --- a/system/gd/os/chromeos/metrics.cc +++ b/system/gd/os/chromeos/metrics.cc @@ -22,7 +22,6 @@ #include <metrics/structured_events.h> #include "metrics/utils.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/chromeos/parameter_provider.cc b/system/gd/os/chromeos/parameter_provider.cc index 2302a68e11..a8ee19c5a6 100644 --- a/system/gd/os/chromeos/parameter_provider.cc +++ b/system/gd/os/chromeos/parameter_provider.cc @@ -22,8 +22,6 @@ #include <mutex> #include <string> -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/chromeos/wakelock_native.cc b/system/gd/os/chromeos/wakelock_native.cc index 8cf7f71fde..33c84d45b5 100644 --- a/system/gd/os/chromeos/wakelock_native.cc +++ b/system/gd/os/chromeos/wakelock_native.cc @@ -22,8 +22,6 @@ #include <bluetooth/log.h> -#include "os/log.h" - namespace bluetooth { namespace os { namespace internal { diff --git a/system/gd/os/handler.cc b/system/gd/os/handler.cc index f49236fde3..388fcd4c72 100644 --- a/system/gd/os/handler.cc +++ b/system/gd/os/handler.cc @@ -20,7 +20,6 @@ #include "common/bind.h" #include "common/callback.h" -#include "os/log.h" #include "os/reactor.h" namespace bluetooth { diff --git a/system/gd/os/handler_unittest.cc b/system/gd/os/handler_unittest.cc index 0a06699c39..7306effd30 100644 --- a/system/gd/os/handler_unittest.cc +++ b/system/gd/os/handler_unittest.cc @@ -22,7 +22,6 @@ #include "common/bind.h" #include "common/callback.h" #include "gtest/gtest.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/host/metrics.cc b/system/gd/os/host/metrics.cc index 27e5d7d470..a019033348 100644 --- a/system/gd/os/host/metrics.cc +++ b/system/gd/os/host/metrics.cc @@ -18,8 +18,6 @@ #include "os/metrics.h" -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/host/parameter_provider.cc b/system/gd/os/host/parameter_provider.cc index 37d6232ebe..7b150da4be 100644 --- a/system/gd/os/host/parameter_provider.cc +++ b/system/gd/os/host/parameter_provider.cc @@ -23,8 +23,6 @@ #include <mutex> #include <string> -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/host/wakelock_native.cc b/system/gd/os/host/wakelock_native.cc index d09d91fbf3..dd8026d007 100644 --- a/system/gd/os/host/wakelock_native.cc +++ b/system/gd/os/host/wakelock_native.cc @@ -22,8 +22,6 @@ #include <bluetooth/log.h> -#include "os/log.h" - namespace bluetooth { namespace os { namespace internal { diff --git a/system/gd/os/linux/metrics.cc b/system/gd/os/linux/metrics.cc index df3a413eee..c5e38493da 100644 --- a/system/gd/os/linux/metrics.cc +++ b/system/gd/os/linux/metrics.cc @@ -18,8 +18,6 @@ #include "os/metrics.h" -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/linux/parameter_provider.cc b/system/gd/os/linux/parameter_provider.cc index 2302a68e11..a8ee19c5a6 100644 --- a/system/gd/os/linux/parameter_provider.cc +++ b/system/gd/os/linux/parameter_provider.cc @@ -22,8 +22,6 @@ #include <mutex> #include <string> -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/linux/wakelock_native.cc b/system/gd/os/linux/wakelock_native.cc index 8cf7f71fde..33c84d45b5 100644 --- a/system/gd/os/linux/wakelock_native.cc +++ b/system/gd/os/linux/wakelock_native.cc @@ -22,8 +22,6 @@ #include <bluetooth/log.h> -#include "os/log.h" - namespace bluetooth { namespace os { namespace internal { diff --git a/system/gd/os/linux_generic/alarm.cc b/system/gd/os/linux_generic/alarm.cc index 971b595dbc..46c06e5d26 100644 --- a/system/gd/os/linux_generic/alarm.cc +++ b/system/gd/os/linux_generic/alarm.cc @@ -25,7 +25,6 @@ #include "common/bind.h" #include "os/linux_generic/linux.h" -#include "os/log.h" #include "os/utils.h" #ifdef __ANDROID__ diff --git a/system/gd/os/linux_generic/files.cc b/system/gd/os/linux_generic/files.cc index 38896cccc7..a759e1d631 100644 --- a/system/gd/os/linux_generic/files.cc +++ b/system/gd/os/linux_generic/files.cc @@ -28,8 +28,6 @@ #include <streambuf> #include <string> -#include "os/log.h" - namespace { void HandleError(const std::string& temp_path, int* dir_fd, FILE** fp) { diff --git a/system/gd/os/linux_generic/reactive_semaphore.cc b/system/gd/os/linux_generic/reactive_semaphore.cc index 47d1ee9406..57fc9d6fe9 100644 --- a/system/gd/os/linux_generic/reactive_semaphore.cc +++ b/system/gd/os/linux_generic/reactive_semaphore.cc @@ -24,7 +24,6 @@ #include <functional> #include "os/linux_generic/linux.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/linux_generic/reactor.cc b/system/gd/os/linux_generic/reactor.cc index 58a5f93a11..4fc2ac92b3 100644 --- a/system/gd/os/linux_generic/reactor.cc +++ b/system/gd/os/linux_generic/reactor.cc @@ -27,8 +27,6 @@ #include <cinttypes> #include <cstring> -#include "os/log.h" - namespace { // Use at most sizeof(epoll_event) * kEpollMaxEvents kernel memory diff --git a/system/gd/os/linux_generic/reactor_unittest.cc b/system/gd/os/linux_generic/reactor_unittest.cc index de6b829a67..d131f5f74d 100644 --- a/system/gd/os/linux_generic/reactor_unittest.cc +++ b/system/gd/os/linux_generic/reactor_unittest.cc @@ -26,7 +26,6 @@ #include "common/bind.h" #include "common/callback.h" #include "gtest/gtest.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/linux_generic/repeating_alarm.cc b/system/gd/os/linux_generic/repeating_alarm.cc index f62de8be65..20542228d4 100644 --- a/system/gd/os/linux_generic/repeating_alarm.cc +++ b/system/gd/os/linux_generic/repeating_alarm.cc @@ -24,7 +24,6 @@ #include "common/bind.h" #include "os/linux_generic/linux.h" -#include "os/log.h" #include "os/utils.h" #ifdef __ANDROID__ diff --git a/system/gd/os/linux_generic/thread.cc b/system/gd/os/linux_generic/thread.cc index 9bc2e496b1..33dfb2a229 100644 --- a/system/gd/os/linux_generic/thread.cc +++ b/system/gd/os/linux_generic/thread.cc @@ -24,8 +24,6 @@ #include <cerrno> #include <cstring> -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/os/linux_generic/wakelock_manager.cc b/system/gd/os/linux_generic/wakelock_manager.cc index 022904c942..b8cc9000ba 100644 --- a/system/gd/os/linux_generic/wakelock_manager.cc +++ b/system/gd/os/linux_generic/wakelock_manager.cc @@ -26,7 +26,6 @@ #include <mutex> #include "os/internal/wakelock_native.h" -#include "os/log.h" // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/gd/os/log.h b/system/gd/os/log.h deleted file mode 100644 index 456fbe3f0d..0000000000 --- a/system/gd/os/log.h +++ /dev/null @@ -1,30 +0,0 @@ -/****************************************************************************** - * - * Copyright 2019 Google, Inc. - * - * 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 <inttypes.h> - -#include <cstdlib> - -#include "os/logging/log_adapter.h" - -#if defined(__ANDROID__) -#include <log/log.h> -#include <log/log_event_list.h> -#endif // defined(__ANDROID__) diff --git a/system/gd/os/mock_queue.h b/system/gd/os/mock_queue.h index 41aa743e9c..03ede2025b 100644 --- a/system/gd/os/mock_queue.h +++ b/system/gd/os/mock_queue.h @@ -26,7 +26,6 @@ #include "common/bind.h" #include "common/callback.h" #include "os/handler.h" -#include "os/log.h" #include "os/queue.h" namespace bluetooth { diff --git a/system/gd/os/queue.h b/system/gd/os/queue.h index d722c33a4a..fef9073202 100644 --- a/system/gd/os/queue.h +++ b/system/gd/os/queue.h @@ -27,7 +27,6 @@ #include "common/callback.h" #include "os/handler.h" #include "os/linux_generic/reactive_semaphore.h" -#include "os/log.h" namespace bluetooth { namespace os { diff --git a/system/gd/os/rand.h b/system/gd/os/rand.h index edda493b31..e2b0b649fd 100644 --- a/system/gd/os/rand.h +++ b/system/gd/os/rand.h @@ -22,8 +22,6 @@ #include <array> #include <cstdint> -#include "os/log.h" - namespace bluetooth { namespace os { diff --git a/system/gd/packet/bit_inserter_unittest.cc b/system/gd/packet/bit_inserter_unittest.cc index 5c78db51ff..636fa470bd 100644 --- a/system/gd/packet/bit_inserter_unittest.cc +++ b/system/gd/packet/bit_inserter_unittest.cc @@ -20,8 +20,6 @@ #include <memory> -#include "os/log.h" - using bluetooth::packet::BitInserter; using std::vector; diff --git a/system/gd/packet/fragmenting_inserter_unittest.cc b/system/gd/packet/fragmenting_inserter_unittest.cc index dee70a615c..5d90a5a075 100644 --- a/system/gd/packet/fragmenting_inserter_unittest.cc +++ b/system/gd/packet/fragmenting_inserter_unittest.cc @@ -20,8 +20,6 @@ #include <memory> -#include "os/log.h" - using bluetooth::packet::FragmentingInserter; using std::vector; diff --git a/system/gd/packet/packet_builder.h b/system/gd/packet/packet_builder.h index e86af5289d..19a0be1183 100644 --- a/system/gd/packet/packet_builder.h +++ b/system/gd/packet/packet_builder.h @@ -22,7 +22,6 @@ #include <memory> #include <vector> -#include "os/log.h" #include "packet/base_packet_builder.h" #include "packet/bit_inserter.h" #include "packet/endian_inserter.h" diff --git a/system/gd/packet/packet_struct.h b/system/gd/packet/packet_struct.h index 92e3200f35..92ab83e4db 100644 --- a/system/gd/packet/packet_struct.h +++ b/system/gd/packet/packet_struct.h @@ -22,7 +22,6 @@ #include <memory> #include <vector> -#include "os/log.h" #include "packet/base_struct.h" #include "packet/bit_inserter.h" #include "packet/endian_inserter.h" diff --git a/system/gd/packet/parser/test/generated_packet_test.cc b/system/gd/packet/parser/test/generated_packet_test.cc index 66ca1fb7cc..e706e15bee 100644 --- a/system/gd/packet/parser/test/generated_packet_test.cc +++ b/system/gd/packet/parser/test/generated_packet_test.cc @@ -20,7 +20,7 @@ #include <memory> #define PACKET_TESTING -#include "os/log.h" + #include "packet/bit_inserter.h" #include "packet/parser/test/big_endian_test_packets.h" #include "packet/parser/test/six_bytes.h" diff --git a/system/gd/packet/raw_builder.cc b/system/gd/packet/raw_builder.cc index 604d3ee8a1..49ebeed351 100644 --- a/system/gd/packet/raw_builder.cc +++ b/system/gd/packet/raw_builder.cc @@ -19,8 +19,6 @@ #include <algorithm> #include <utility> -#include "os/log.h" - namespace bluetooth { namespace packet { diff --git a/system/gd/rust/topshim/csis/csis_shim.cc b/system/gd/rust/topshim/csis/csis_shim.cc index 371d4976f5..c08deb019d 100644 --- a/system/gd/rust/topshim/csis/csis_shim.cc +++ b/system/gd/rust/topshim/csis/csis_shim.cc @@ -21,7 +21,6 @@ #include <string> -#include "os/log.h" #include "src/profiles/csis.rs.h" #include "types/bluetooth/uuid.h" #include "types/raw_address.h" @@ -101,19 +100,18 @@ public: DBusCsisClientCallbacks() {} void OnConnectionState(const RawAddress& addr, csis::ConnectionState state) override { - log::info("addr={}, state={}", ADDRESS_TO_LOGGABLE_CSTR(addr), static_cast<uint8_t>(state)); + log::info("addr={}, state={}", addr, static_cast<uint8_t>(state)); topshim::rust::internal::connection_state_cb(addr, state); } void OnDeviceAvailable(const RawAddress& addr, int group_id, int group_size, int rank, const bluetooth::Uuid& uuid) override { - log::info("addr={}, group_id={}, group_size={}, rank={}", ADDRESS_TO_LOGGABLE_CSTR(addr), - group_id, group_size, rank); + log::info("addr={}, group_id={}, group_size={}, rank={}", addr, group_id, group_size, rank); topshim::rust::internal::device_available_cb(addr, group_id, group_size, rank, uuid); } void OnSetMemberAvailable(const RawAddress& addr, int group_id) { - log::info("addr={}, group_id={}", ADDRESS_TO_LOGGABLE_CSTR(addr), group_id); + log::info("addr={}, group_id={}", addr, group_id); topshim::rust::internal::set_member_available_cb(addr, group_id); } diff --git a/system/gd/rust/topshim/hfp/hfp_shim.cc b/system/gd/rust/topshim/hfp/hfp_shim.cc index 12c338e535..549b54a479 100644 --- a/system/gd/rust/topshim/hfp/hfp_shim.cc +++ b/system/gd/rust/topshim/hfp/hfp_shim.cc @@ -22,7 +22,6 @@ #include "common/strings.h" #include "device/include/interop.h" #include "include/hardware/bt_hf.h" -#include "os/log.h" #include "src/profiles/hfp.rs.h" #include "types/raw_address.h" diff --git a/system/gd/rust/topshim/le_audio/le_audio_shim.cc b/system/gd/rust/topshim/le_audio/le_audio_shim.cc index bb70fc37d0..77d7a5c60d 100644 --- a/system/gd/rust/topshim/le_audio/le_audio_shim.cc +++ b/system/gd/rust/topshim/le_audio/le_audio_shim.cc @@ -22,7 +22,6 @@ #include <vector> #include "bta/le_audio/le_audio_types.h" -#include "os/log.h" #include "src/profiles/le_audio.rs.h" #include "types/raw_address.h" @@ -253,7 +252,7 @@ public: } void OnConnectionState(le_audio::ConnectionState state, const RawAddress& address) override { - log::info("state={}, address={}", static_cast<int>(state), ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("state={}, address={}", static_cast<int>(state), address); topshim::rust::internal::connection_state_cb(state, address); } @@ -264,8 +263,8 @@ public: void OnGroupNodeStatus(const RawAddress& bd_addr, int group_id, le_audio::GroupNodeStatus node_status) { - log::info("bd_addr={}, group_id={}, node_status={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - group_id, static_cast<int>(node_status)); + log::info("bd_addr={}, group_id={}, node_status={}", bd_addr, group_id, + static_cast<int>(node_status)); topshim::rust::internal::group_node_status_cb(bd_addr, group_id, node_status); } @@ -280,8 +279,7 @@ public: } void OnSinkAudioLocationAvailable(const RawAddress& address, uint32_t snk_audio_locations) { - log::info("address={}, snk_audio_locations={}", ADDRESS_TO_LOGGABLE_CSTR(address), - snk_audio_locations); + log::info("address={}, snk_audio_locations={}", address, snk_audio_locations); topshim::rust::internal::sink_audio_location_available_cb(address, snk_audio_locations); } @@ -323,7 +321,7 @@ public: void OnHealthBasedRecommendationAction(const RawAddress& address, le_audio::LeAudioHealthBasedAction action) { - log::info("address={}, action={}", ADDRESS_TO_LOGGABLE_CSTR(address), static_cast<int>(action)); + log::info("address={}, action={}", address, static_cast<int>(action)); } void OnHealthBasedGroupRecommendationAction(int group_id, diff --git a/system/gd/rust/topshim/vc/vc_shim.cc b/system/gd/rust/topshim/vc/vc_shim.cc index 55d8369db6..f7f68d5af2 100644 --- a/system/gd/rust/topshim/vc/vc_shim.cc +++ b/system/gd/rust/topshim/vc/vc_shim.cc @@ -21,7 +21,6 @@ #include <string> -#include "os/log.h" #include "src/profiles/vc.rs.h" #include "types/raw_address.h" @@ -94,14 +93,14 @@ public: DBusVolumeControlCallbacks() {} void OnConnectionState(vc::ConnectionState state, const RawAddress& address) override { - log::info("state={}, address={}", static_cast<int>(state), ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("state={}, address={}", static_cast<int>(state), address); topshim::rust::internal::connection_state_cb(state, address); } void OnVolumeStateChanged(const RawAddress& address, uint8_t volume, bool mute, uint8_t flags, bool is_autonomous) override { - log::info("address={}, volume={}, mute={}, flags={}, is_autonomous={}", - ADDRESS_TO_LOGGABLE_CSTR(address), volume, mute, flags, is_autonomous); + log::info("address={}, volume={}, mute={}, flags={}, is_autonomous={}", address, volume, mute, + flags, is_autonomous); topshim::rust::internal::volume_state_cb(address, volume, mute, is_autonomous); } @@ -120,22 +119,19 @@ public: void OnExtAudioOutVolumeOffsetChanged(const RawAddress& address, uint8_t ext_output_id, int16_t offset) override { - log::info("address={}, ext_output_id={}, offset={}", ADDRESS_TO_LOGGABLE_CSTR(address), - ext_output_id, offset); + log::info("address={}, ext_output_id={}, offset={}", address, ext_output_id, offset); topshim::rust::internal::ext_audio_out_volume_offset_cb(address, ext_output_id, offset); } void OnExtAudioOutLocationChanged(const RawAddress& address, uint8_t ext_output_id, uint32_t location) override { - log::info("address={}, ext_output_id, location={}", ADDRESS_TO_LOGGABLE_CSTR(address), - ext_output_id, location); + log::info("address={}, ext_output_id, location={}", address, ext_output_id, location); topshim::rust::internal::ext_audio_out_location_cb(address, ext_output_id, location); } void OnExtAudioOutDescriptionChanged(const RawAddress& address, uint8_t ext_output_id, std::string descr) override { - log::info("address={}, ext_output_id={}, descr={}", ADDRESS_TO_LOGGABLE_CSTR(address), - ext_output_id, descr.c_str()); + log::info("address={}, ext_output_id={}, descr={}", address, ext_output_id, descr.c_str()); topshim::rust::internal::ext_audio_out_description_cb(address, ext_output_id, descr); } diff --git a/system/gd/shim/dumpsys.cc b/system/gd/shim/dumpsys.cc index 24a0083175..30d9f70c0b 100644 --- a/system/gd/shim/dumpsys.cc +++ b/system/gd/shim/dumpsys.cc @@ -30,7 +30,6 @@ #include "main/shim/stack.h" #include "module.h" #include "module_dumper.h" -#include "os/log.h" #include "os/system_properties.h" #include "shim/dumpsys.h" diff --git a/system/gd/stack_manager.cc b/system/gd/stack_manager.cc index d62507400c..856d10a3c4 100644 --- a/system/gd/stack_manager.cc +++ b/system/gd/stack_manager.cc @@ -25,7 +25,6 @@ #include "common/bind.h" #include "module.h" #include "os/handler.h" -#include "os/log.h" #include "os/system_properties.h" #include "os/thread.h" #include "os/wakelock_manager.h" diff --git a/system/gd/storage/device.cc b/system/gd/storage/device.cc index 50d973bdc5..7210a110fe 100644 --- a/system/gd/storage/device.cc +++ b/system/gd/storage/device.cc @@ -21,7 +21,6 @@ #include <algorithm> #include <limits> -#include "os/log.h" #include "storage/classic_device.h" #include "storage/config_cache_helper.h" #include "storage/le_device.h" diff --git a/system/gd/storage/legacy_config_file.cc b/system/gd/storage/legacy_config_file.cc index a64be377ea..0bee52af03 100644 --- a/system/gd/storage/legacy_config_file.cc +++ b/system/gd/storage/legacy_config_file.cc @@ -24,7 +24,6 @@ #include "common/strings.h" #include "os/files.h" -#include "os/log.h" #include "storage/device.h" namespace bluetooth { diff --git a/system/gd/storage/mutation.cc b/system/gd/storage/mutation.cc index c0dacdcc80..559a0415d9 100644 --- a/system/gd/storage/mutation.cc +++ b/system/gd/storage/mutation.cc @@ -16,8 +16,6 @@ #include "storage/mutation.h" -#include "os/log.h" - namespace bluetooth { namespace storage { diff --git a/system/gd/storage/mutation.h b/system/gd/storage/mutation.h index ddaf5804f2..493faddace 100644 --- a/system/gd/storage/mutation.h +++ b/system/gd/storage/mutation.h @@ -17,7 +17,6 @@ #include <queue> -#include "os/log.h" #include "storage/config_cache.h" #include "storage/mutation_entry.h" diff --git a/system/gd/storage/mutation_entry.cc b/system/gd/storage/mutation_entry.cc index 6d078d60a8..f1c930e576 100644 --- a/system/gd/storage/mutation_entry.cc +++ b/system/gd/storage/mutation_entry.cc @@ -16,8 +16,6 @@ #include "storage/mutation_entry.h" -#include "os/log.h" - namespace bluetooth { namespace storage { diff --git a/system/gd/sysprops/sysprops_module.cc b/system/gd/sysprops/sysprops_module.cc index dfb5bfbc5a..0cdcaa2efa 100644 --- a/system/gd/sysprops/sysprops_module.cc +++ b/system/gd/sysprops/sysprops_module.cc @@ -19,7 +19,6 @@ #include <filesystem> #include "os/handler.h" -#include "os/log.h" #include "os/parameter_provider.h" #include "os/system_properties.h" #include "storage/legacy_config_file.h" diff --git a/system/hci/src/packet_fragmenter.cc b/system/hci/src/packet_fragmenter.cc index 9ecb6bd7b5..c95c25dfe6 100644 --- a/system/hci/src/packet_fragmenter.cc +++ b/system/hci/src/packet_fragmenter.cc @@ -28,7 +28,6 @@ #include "hci/include/buffer_allocator.h" #include "hci/include/hci_layer.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" diff --git a/system/main/shim/config.cc b/system/main/shim/config.cc index efa9e14221..a2568e455c 100644 --- a/system/main/shim/config.cc +++ b/system/main/shim/config.cc @@ -23,7 +23,6 @@ #include <cstring> #include "main/shim/entry.h" -#include "os/log.h" #include "storage/storage_module.h" using ::bluetooth::shim::GetStorage; diff --git a/system/main/stack_config.cc b/system/main/stack_config.cc index ae5ebc4da5..9b04e7f16c 100644 --- a/system/main/stack_config.cc +++ b/system/main/stack_config.cc @@ -22,7 +22,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "osi/include/future.h" using namespace bluetooth; diff --git a/system/osi/src/alarm.cc b/system/osi/src/alarm.cc index 0d515c486d..a280442bb0 100644 --- a/system/osi/src/alarm.cc +++ b/system/osi/src/alarm.cc @@ -32,7 +32,6 @@ #include <mutex> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/fixed_queue.h" #include "osi/include/list.h" diff --git a/system/osi/src/future.cc b/system/osi/src/future.cc index 63dc254123..ce8c7f0b4b 100644 --- a/system/osi/src/future.cc +++ b/system/osi/src/future.cc @@ -22,7 +22,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "osi/semaphore.h" diff --git a/system/osi/src/internal/semaphore.cc b/system/osi/src/internal/semaphore.cc index 23aa60c131..8f2706862f 100644 --- a/system/osi/src/internal/semaphore.cc +++ b/system/osi/src/internal/semaphore.cc @@ -27,7 +27,6 @@ #include <sys/eventfd.h> #include <unistd.h> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" diff --git a/system/osi/src/reactor.cc b/system/osi/src/reactor.cc index 045bc24f3c..82522172c5 100644 --- a/system/osi/src/reactor.cc +++ b/system/osi/src/reactor.cc @@ -30,7 +30,6 @@ #include <mutex> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/list.h" diff --git a/system/osi/src/socket.cc b/system/osi/src/socket.cc index c1694e68c3..0c7c96b71c 100644 --- a/system/osi/src/socket.cc +++ b/system/osi/src/socket.cc @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <unistd.h> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "osi/include/reactor.h" diff --git a/system/osi/src/stack_power_telemetry.cc b/system/osi/src/stack_power_telemetry.cc index f8ca11e32c..262bb2afb2 100644 --- a/system/osi/src/stack_power_telemetry.cc +++ b/system/osi/src/stack_power_telemetry.cc @@ -28,7 +28,7 @@ #include <map> #include <mutex> -#include "os/log.h" +#include "os/logging/log_adapter.h" #include "osi/include/properties.h" #include "stack/include/acl_api_types.h" #include "stack/include/bt_psm_types.h" diff --git a/system/osi/src/thread.cc b/system/osi/src/thread.cc index b43a576458..0fa15fc6d3 100644 --- a/system/osi/src/thread.cc +++ b/system/osi/src/thread.cc @@ -32,7 +32,6 @@ #include <atomic> #include <cerrno> -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/fixed_queue.h" diff --git a/system/osi/src/wakelock.cc b/system/osi/src/wakelock.cc index 9865ecb16a..5cae5ed580 100644 --- a/system/osi/src/wakelock.cc +++ b/system/osi/src/wakelock.cc @@ -34,7 +34,6 @@ #include <string> #include "common/metrics.h" -#include "os/log.h" #include "osi/include/osi.h" using bluetooth::common::BluetoothMetricsLogger; diff --git a/system/rust/src/core/ffi/module.cc b/system/rust/src/core/ffi/module.cc index 5e79d143fa..edd2b13b58 100644 --- a/system/rust/src/core/ffi/module.cc +++ b/system/rust/src/core/ffi/module.cc @@ -20,7 +20,7 @@ #include <hardware/bt_gatt.h> #include "btcore/include/module.h" -#include "os/log.h" + #ifndef TARGET_FLOSS #include "src/core/ffi.rs.h" #include "src/gatt/ffi.rs.h" diff --git a/system/rust/src/gatt/ffi/gatt_shim.cc b/system/rust/src/gatt/ffi/gatt_shim.cc index 3b17f83cda..442c5b5fa4 100644 --- a/system/rust/src/gatt/ffi/gatt_shim.cc +++ b/system/rust/src/gatt/ffi/gatt_shim.cc @@ -26,7 +26,6 @@ #include "include/hardware/bt_common_types.h" #include "include/hardware/bt_gatt_client.h" #include "include/hardware/bt_gatt_server.h" -#include "os/log.h" #include "rust/cxx.h" #include "stack/include/gatt_api.h" #include "types/bluetooth/uuid.h" diff --git a/system/stack/a2dp/a2dp_aac.cc b/system/stack/a2dp/a2dp_aac.cc index 1784e824c5..ca0dec4037 100644 --- a/system/stack/a2dp/a2dp_aac.cc +++ b/system/stack/a2dp/a2dp_aac.cc @@ -31,7 +31,6 @@ #include "a2dp_aac_decoder.h" #include "a2dp_aac_encoder.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/osi.h" #include "osi/include/properties.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_aac_decoder.cc b/system/stack/a2dp/a2dp_aac_decoder.cc index e1fb4f4929..fba7ea44cf 100644 --- a/system/stack/a2dp/a2dp_aac_decoder.cc +++ b/system/stack/a2dp/a2dp_aac_decoder.cc @@ -21,7 +21,6 @@ #include <aacdecoder_lib.h> #include <bluetooth/log.h> -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_aac_encoder.cc b/system/stack/a2dp/a2dp_aac_encoder.cc index d322d7f8cf..774fdd92ae 100644 --- a/system/stack/a2dp/a2dp_aac_encoder.cc +++ b/system/stack/a2dp/a2dp_aac_encoder.cc @@ -26,7 +26,6 @@ #include "a2dp_aac.h" #include "common/time_util.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_sbc_encoder.cc b/system/stack/a2dp/a2dp_sbc_encoder.cc index c0c923ec82..e5cb555262 100644 --- a/system/stack/a2dp/a2dp_sbc_encoder.cc +++ b/system/stack/a2dp/a2dp_sbc_encoder.cc @@ -25,11 +25,14 @@ #include <limits.h> #include <string.h> +#include <cinttypes> + #include "a2dp_sbc.h" #include "a2dp_sbc_up_sample.h" #include "common/time_util.h" #include "embdrv/sbc/encoder/include/sbc_encoder.h" #include "internal_include/bt_target.h" +#include "os/logging/log_adapter.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc b/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc index 969a06643d..7bb81bf244 100644 --- a/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc @@ -28,7 +28,6 @@ #include "aptXbtenc.h" #include "common/time_util.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_aptx_hd.cc b/system/stack/a2dp/a2dp_vendor_aptx_hd.cc index f6ed0c6cfa..cc59936638 100644 --- a/system/stack/a2dp/a2dp_vendor_aptx_hd.cc +++ b/system/stack/a2dp/a2dp_vendor_aptx_hd.cc @@ -32,7 +32,6 @@ #include "a2dp_vendor_aptx_hd_encoder.h" #include "btif/include/btif_av_co.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc b/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc index d6daf805a5..b6996d0108 100644 --- a/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc @@ -28,7 +28,6 @@ #include "aptXHDbtenc.h" #include "common/time_util.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_ldac.cc b/system/stack/a2dp/a2dp_vendor_ldac.cc index b3ad871b31..8c1519eb65 100644 --- a/system/stack/a2dp/a2dp_vendor_ldac.cc +++ b/system/stack/a2dp/a2dp_vendor_ldac.cc @@ -32,7 +32,6 @@ #include "a2dp_vendor_ldac_encoder.h" #include "btif/include/btif_av_co.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_ldac_decoder.cc b/system/stack/a2dp/a2dp_vendor_ldac_decoder.cc index 4babdc79dc..4107e64e90 100644 --- a/system/stack/a2dp/a2dp_vendor_ldac_decoder.cc +++ b/system/stack/a2dp/a2dp_vendor_ldac_decoder.cc @@ -26,7 +26,6 @@ #include <string.h> #include "a2dp_vendor_ldac.h" -#include "os/log.h" #include "stack/include/bt_hdr.h" using namespace bluetooth; diff --git a/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc b/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc index 7a616a038a..d89de9a550 100644 --- a/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc @@ -31,7 +31,6 @@ #include "a2dp_vendor_ldac.h" #include "common/time_util.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/properties.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/a2dp/a2dp_vendor_opus.cc b/system/stack/a2dp/a2dp_vendor_opus.cc index f6fb3c3e2d..fac881856f 100644 --- a/system/stack/a2dp/a2dp_vendor_opus.cc +++ b/system/stack/a2dp/a2dp_vendor_opus.cc @@ -31,7 +31,6 @@ #include "a2dp_vendor_opus_decoder.h" #include "a2dp_vendor_opus_encoder.h" #include "internal_include/bt_trace.h" -#include "os/log.h" #include "osi/include/osi.h" using namespace bluetooth; diff --git a/system/stack/a2dp/a2dp_vendor_opus_decoder.cc b/system/stack/a2dp/a2dp_vendor_opus_decoder.cc index 25658e60c0..bbbd3a2c3b 100644 --- a/system/stack/a2dp/a2dp_vendor_opus_decoder.cc +++ b/system/stack/a2dp/a2dp_vendor_opus_decoder.cc @@ -22,7 +22,6 @@ #include <opus.h> #include "a2dp_vendor_opus.h" -#include "os/log.h" #include "osi/include/allocator.h" using namespace bluetooth; diff --git a/system/stack/a2dp/a2dp_vendor_opus_encoder.cc b/system/stack/a2dp/a2dp_vendor_opus_encoder.cc index b59288c7c6..e7476c1028 100644 --- a/system/stack/a2dp/a2dp_vendor_opus_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_opus_encoder.cc @@ -26,7 +26,6 @@ #include "a2dp_vendor.h" #include "a2dp_vendor_opus.h" #include "common/time_util.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/acl/btm_pm.cc b/system/stack/acl/btm_pm.cc index f77efd47b7..c34e776a1f 100644 --- a/system/stack/acl/btm_pm.cc +++ b/system/stack/acl/btm_pm.cc @@ -42,7 +42,6 @@ #include "internal_include/bt_target.h" #include "main/shim/dumpsys.h" #include "main/shim/entry.h" -#include "os/log.h" #include "osi/include/stack_power_telemetry.h" #include "stack/btm/btm_int_types.h" #include "stack/include/bt_types.h" diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc index c8e12c4f08..01673e0854 100644 --- a/system/stack/avct/avct_lcb.cc +++ b/system/stack/avct/avct_lcb.cc @@ -32,7 +32,6 @@ #include "avct_int.h" #include "device/include/device_iot_config.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "types/raw_address.h" diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc index d293517a54..6304e78255 100644 --- a/system/stack/avdt/avdt_api.cc +++ b/system/stack/avdt/avdt_api.cc @@ -35,6 +35,7 @@ #include "avdtc_api.h" #include "bta/include/bta_sec_api.h" #include "internal_include/bt_target.h" +#include "os/logging/log_adapter.h" #include "stack/include/a2dp_codec_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/l2cap_interface.h" diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc index d8d5269340..4241cd741a 100644 --- a/system/stack/avdt/avdt_msg.cc +++ b/system/stack/avdt/avdt_msg.cc @@ -35,7 +35,6 @@ #include "avdt_int.h" #include "avdtc_api.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/avrc/avrc_api.cc b/system/stack/avrc/avrc_api.cc index 60d1da067e..2acddeb5e0 100644 --- a/system/stack/avrc/avrc_api.cc +++ b/system/stack/avrc/avrc_api.cc @@ -31,7 +31,6 @@ #include "btif/include/btif_av.h" #include "btif/include/btif_config.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/fixed_queue.h" #include "osi/include/properties.h" diff --git a/system/stack/avrc/avrc_bld_ct.cc b/system/stack/avrc/avrc_bld_ct.cc index 3ec2164046..a68c9dca9d 100644 --- a/system/stack/avrc/avrc_bld_ct.cc +++ b/system/stack/avrc/avrc_bld_ct.cc @@ -25,7 +25,6 @@ #include "avrc_defs.h" #include "avrc_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" diff --git a/system/stack/avrc/avrc_bld_tg.cc b/system/stack/avrc/avrc_bld_tg.cc index 6390232293..7b5791a8c2 100644 --- a/system/stack/avrc/avrc_bld_tg.cc +++ b/system/stack/avrc/avrc_bld_tg.cc @@ -24,7 +24,6 @@ #include "avrc_defs.h" #include "avrc_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/avct/avct_defs.h" diff --git a/system/stack/avrc/avrc_pars_ct.cc b/system/stack/avrc/avrc_pars_ct.cc index 045cee3dd2..2560ebab99 100644 --- a/system/stack/avrc/avrc_pars_ct.cc +++ b/system/stack/avrc/avrc_pars_ct.cc @@ -21,7 +21,6 @@ #include "avrc_api.h" #include "avrc_defs.h" #include "avrc_int.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/bt_types.h" diff --git a/system/stack/avrc/avrc_pars_tg.cc b/system/stack/avrc/avrc_pars_tg.cc index b178fd5acb..dd4f9bdcfe 100644 --- a/system/stack/avrc/avrc_pars_tg.cc +++ b/system/stack/avrc/avrc_pars_tg.cc @@ -21,7 +21,6 @@ #include "avrc_api.h" #include "avrc_defs.h" #include "avrc_int.h" -#include "os/log.h" #include "stack/include/bt_types.h" using namespace bluetooth; diff --git a/system/stack/avrc/avrc_sdp.cc b/system/stack/avrc/avrc_sdp.cc index cb209dde09..d4ed5bb421 100644 --- a/system/stack/avrc/avrc_sdp.cc +++ b/system/stack/avrc/avrc_sdp.cc @@ -28,7 +28,6 @@ #include "avrc_api.h" #include "avrc_int.h" -#include "os/log.h" #include "stack/include/bt_types.h" #include "stack/include/bt_uuid16.h" #include "stack/include/sdp_api.h" diff --git a/system/stack/avrc/avrc_utils.cc b/system/stack/avrc/avrc_utils.cc index cf2d428385..6e07b12d73 100644 --- a/system/stack/avrc/avrc_utils.cc +++ b/system/stack/avrc/avrc_utils.cc @@ -22,7 +22,6 @@ #include "avrc_api.h" #include "avrc_int.h" -#include "os/log.h" #include "stack/include/bt_types.h" using namespace bluetooth; diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc index 308a69cd85..aae99cc80f 100644 --- a/system/stack/btm/btm_ble_addr.cc +++ b/system/stack/btm/btm_ble_addr.cc @@ -36,7 +36,6 @@ #include "crypto_toolbox/crypto_toolbox.h" #include "hci/controller_interface.h" #include "main/shim/entry.h" -#include "os/log.h" #include "stack/btm/btm_int_types.h" #include "stack/include/acl_api.h" #include "stack/include/bt_octets.h" diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h index ddebeb9439..fcd97d0332 100644 --- a/system/stack/btm/btm_iso_impl.h +++ b/system/stack/btm/btm_iso_impl.h @@ -33,7 +33,6 @@ #include "internal_include/stack_config.h" #include "main/shim/entry.h" #include "main/shim/hci_layer.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" diff --git a/system/stack/btm/btm_sco_hci.cc b/system/stack/btm/btm_sco_hci.cc index a7f5e152ac..dc9d189691 100644 --- a/system/stack/btm/btm_sco_hci.cc +++ b/system/stack/btm/btm_sco_hci.cc @@ -28,7 +28,6 @@ #include "bta/ag/bta_ag_int.h" #include "btif/include/core_callbacks.h" #include "btif/include/stack_manager_t.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/btm/btm_sco.h" #include "udrv/include/uipc.h" diff --git a/system/stack/btm/btm_sco_hfp_hal_linux.cc b/system/stack/btm/btm_sco_hfp_hal_linux.cc index 018ba1fd65..9ca83962ee 100644 --- a/system/stack/btm/btm_sco_hfp_hal_linux.cc +++ b/system/stack/btm/btm_sco_hfp_hal_linux.cc @@ -23,7 +23,6 @@ #include "hci/controller_interface.h" #include "main/shim/entry.h" -#include "os/log.h" #include "osi/include/properties.h" #include "stack/btm/btm_sco_hfp_hal.h" #include "stack/include/hcimsgs.h" diff --git a/system/stack/btm/btm_sec_cb.cc b/system/stack/btm/btm_sec_cb.cc index 3e87d19810..60a2f0398e 100644 --- a/system/stack/btm/btm_sec_cb.cc +++ b/system/stack/btm/btm_sec_cb.cc @@ -25,7 +25,6 @@ #include "internal_include/bt_trace.h" #include "internal_include/stack_config.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/fixed_queue.h" #include "osi/include/list.h" diff --git a/system/stack/btm/btm_security_client_interface.cc b/system/stack/btm/btm_security_client_interface.cc index a8a4a1c556..f2d397a9a7 100644 --- a/system/stack/btm/btm_security_client_interface.cc +++ b/system/stack/btm/btm_security_client_interface.cc @@ -19,7 +19,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "stack/btm/btm_dev.h" #include "stack/btm/btm_sec.h" #include "stack/btm/btm_sec_cb.h" diff --git a/system/stack/btm/hfp_lc3_decoder.cc b/system/stack/btm/hfp_lc3_decoder.cc index 30e30d1ffc..245527b0dc 100644 --- a/system/stack/btm/hfp_lc3_decoder.cc +++ b/system/stack/btm/hfp_lc3_decoder.cc @@ -23,7 +23,6 @@ #include <cstring> -#include "os/log.h" #include "osi/include/allocator.h" using namespace bluetooth; diff --git a/system/stack/btm/hfp_lc3_decoder_linux.cc b/system/stack/btm/hfp_lc3_decoder_linux.cc index b30da4ff19..0ba81c9dd0 100644 --- a/system/stack/btm/hfp_lc3_decoder_linux.cc +++ b/system/stack/btm/hfp_lc3_decoder_linux.cc @@ -23,7 +23,6 @@ #include "hfp_lc3_decoder.h" #include "mmc/codec_client/codec_client.h" #include "mmc/proto/mmc_config.pb.h" -#include "os/log.h" using namespace bluetooth; diff --git a/system/stack/btm/hfp_lc3_encoder.cc b/system/stack/btm/hfp_lc3_encoder.cc index 6e0cdb28df..9d909fef0d 100644 --- a/system/stack/btm/hfp_lc3_encoder.cc +++ b/system/stack/btm/hfp_lc3_encoder.cc @@ -23,7 +23,6 @@ #include <cstring> -#include "os/log.h" #include "osi/include/allocator.h" using namespace bluetooth; diff --git a/system/stack/btm/hfp_lc3_encoder_linux.cc b/system/stack/btm/hfp_lc3_encoder_linux.cc index 448e6403c2..21f8d55d68 100644 --- a/system/stack/btm/hfp_lc3_encoder_linux.cc +++ b/system/stack/btm/hfp_lc3_encoder_linux.cc @@ -21,7 +21,6 @@ #include "hfp_lc3_encoder.h" #include "mmc/codec_client/codec_client.h" #include "mmc/proto/mmc_config.pb.h" -#include "os/log.h" using namespace bluetooth; diff --git a/system/stack/btm/hfp_msbc_decoder.cc b/system/stack/btm/hfp_msbc_decoder.cc index 334cf91f9f..d1396a771d 100644 --- a/system/stack/btm/hfp_msbc_decoder.cc +++ b/system/stack/btm/hfp_msbc_decoder.cc @@ -24,7 +24,6 @@ #include "embdrv/sbc/decoder/include/oi_codec_sbc.h" #include "embdrv/sbc/decoder/include/oi_status.h" -#include "os/log.h" #define HFP_MSBC_PKT_LEN 60 #define HFP_MSBC_PCM_BYTES 240 diff --git a/system/stack/btm/security_device_record.h b/system/stack/btm/security_device_record.h index 14463ac211..c1037a40f4 100644 --- a/system/stack/btm/security_device_record.h +++ b/system/stack/btm/security_device_record.h @@ -26,7 +26,7 @@ #include "internal_include/bt_target.h" #include "macros.h" -#include "os/log.h" +#include "os/logging/log_adapter.h" #include "stack/include/bt_device_type.h" #include "stack/include/bt_name.h" #include "stack/include/bt_octets.h" diff --git a/system/stack/btu/main_thread.cc b/system/stack/btu/main_thread.cc index 03afc210f5..6223e66716 100644 --- a/system/stack/btu/main_thread.cc +++ b/system/stack/btu/main_thread.cc @@ -27,7 +27,6 @@ #include "common/message_loop_thread.h" #include "include/hardware/bluetooth.h" -#include "os/log.h" using bluetooth::common::MessageLoopThread; using namespace bluetooth; diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h index 485c7f6a34..59dc338b5d 100644 --- a/system/stack/gatt/gatt_int.h +++ b/system/stack/gatt/gatt_int.h @@ -34,6 +34,7 @@ #include "gatt_api.h" #include "internal_include/bt_target.h" #include "macros.h" +#include "os/logging/log_adapter.h" #include "osi/include/fixed_queue.h" #include "stack/include/bt_hdr.h" #include "types/bluetooth/uuid.h" diff --git a/system/stack/hid/hidd_api.cc b/system/stack/hid/hidd_api.cc index 3a213d4c1d..79f4d1d7b0 100644 --- a/system/stack/hid/hidd_api.cc +++ b/system/stack/hid/hidd_api.cc @@ -34,7 +34,6 @@ #include "hidd_int.h" #include "hiddefs.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_psm_types.h" #include "stack/include/bt_types.h" diff --git a/system/stack/hid/hidh_api.cc b/system/stack/hid/hidh_api.cc index 72c30e3f13..f415c48fb1 100644 --- a/system/stack/hid/hidh_api.cc +++ b/system/stack/hid/hidh_api.cc @@ -34,7 +34,6 @@ #include "hiddefs.h" #include "hidh_int.h" #include "internal_include/bt_target.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_uuid16.h" diff --git a/system/stack/include/avdt_api.h b/system/stack/include/avdt_api.h index 30a7ebea26..c1275db105 100644 --- a/system/stack/include/avdt_api.h +++ b/system/stack/include/avdt_api.h @@ -33,7 +33,6 @@ #include "internal_include/bt_target.h" #include "macros.h" -#include "os/log.h" #include "stack/include/bt_hdr.h" #include "types/raw_address.h" diff --git a/system/stack/pan/pan_api.cc b/system/stack/pan/pan_api.cc index 496a92050a..1fb209a17b 100644 --- a/system/stack/pan/pan_api.cc +++ b/system/stack/pan/pan_api.cc @@ -36,7 +36,7 @@ #include "bta/sys/bta_sys.h" #include "internal_include/bt_target.h" #include "main/shim/dumpsys.h" -#include "os/log.h" +#include "os/logging/log_adapter.h" #include "osi/include/allocator.h" #include "stack/include/bnep_api.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/pan/pan_main.cc b/system/stack/pan/pan_main.cc index 88b433ed81..0b3cb55898 100644 --- a/system/stack/pan/pan_main.cc +++ b/system/stack/pan/pan_main.cc @@ -31,7 +31,6 @@ #include <cstdint> -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/bnep_api.h" #include "stack/include/bt_hdr.h" diff --git a/system/stack/pan/pan_utils.cc b/system/stack/pan/pan_utils.cc index eda89c4bed..eef9431004 100644 --- a/system/stack/pan/pan_utils.cc +++ b/system/stack/pan/pan_utils.cc @@ -30,7 +30,6 @@ #include <cstdint> #include "internal_include/bt_target.h" -#include "os/log.h" #include "stack/include/bt_types.h" #include "stack/include/bt_uuid16.h" #include "stack/include/sdp_api.h" diff --git a/system/stack/smp/smp_br_main.cc b/system/stack/smp/smp_br_main.cc index 12ee374011..20e6459a02 100644 --- a/system/stack/smp/smp_br_main.cc +++ b/system/stack/smp/smp_br_main.cc @@ -20,7 +20,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "smp_int.h" #include "types/hci_role.h" diff --git a/system/stack/smp/smp_main.cc b/system/stack/smp/smp_main.cc index faaa2567cb..ead1d83028 100644 --- a/system/stack/smp/smp_main.cc +++ b/system/stack/smp/smp_main.cc @@ -20,7 +20,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "smp_int.h" #include "stack/include/btm_log_history.h" diff --git a/system/stack/srvc/srvc_dis.cc b/system/stack/srvc/srvc_dis.cc index 58f6befd11..06cd12336c 100644 --- a/system/stack/srvc/srvc_dis.cc +++ b/system/stack/srvc/srvc_dis.cc @@ -23,7 +23,6 @@ #include "gatt_api.h" #include "hardware/bt_gatt_types.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "srvc_dis_int.h" diff --git a/system/stack/test/a2dp/a2dp_sbc_unittest.cc b/system/stack/test/a2dp/a2dp_sbc_unittest.cc index 950a6100dd..cde2795cfc 100644 --- a/system/stack/test/a2dp/a2dp_sbc_unittest.cc +++ b/system/stack/test/a2dp/a2dp_sbc_unittest.cc @@ -24,7 +24,6 @@ #include <string> #include "common/time_util.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "stack/include/a2dp_sbc_decoder.h" #include "stack/include/a2dp_sbc_encoder.h" diff --git a/system/stack/test/a2dp/wav_reader.cc b/system/stack/test/a2dp/wav_reader.cc index 0dddd30e9f..b692f17014 100644 --- a/system/stack/test/a2dp/wav_reader.cc +++ b/system/stack/test/a2dp/wav_reader.cc @@ -22,7 +22,6 @@ #include <iterator> #include "os/files.h" -#include "os/log.h" namespace bluetooth { namespace testing { diff --git a/system/test/common/jni_thread.cc b/system/test/common/jni_thread.cc index 984b2337c1..db1520d36b 100644 --- a/system/test/common/jni_thread.cc +++ b/system/test/common/jni_thread.cc @@ -21,8 +21,6 @@ #include <map> -#include "os/log.h" - // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/test/common/main_handler.cc b/system/test/common/main_handler.cc index 8728ab1cd8..c6e792c4dc 100644 --- a/system/test/common/main_handler.cc +++ b/system/test/common/main_handler.cc @@ -27,7 +27,6 @@ #include "common/message_loop_thread.h" #include "common/postable_context.h" #include "include/hardware/bluetooth.h" -#include "os/log.h" // TODO(b/369381361) Enfore -Wmissing-prototypes #pragma GCC diagnostic ignored "-Wmissing-prototypes" diff --git a/system/test/headless/adapter/adapter.cc b/system/test/headless/adapter/adapter.cc index bbb3231047..cdf430d459 100644 --- a/system/test/headless/adapter/adapter.cc +++ b/system/test/headless/adapter/adapter.cc @@ -20,7 +20,6 @@ #include <bluetooth/log.h> -#include "gd/os/log.h" #include "test/headless/headless.h" #include "test/headless/interface.h" #include "test/headless/log.h" diff --git a/system/test/headless/discovery/discovery.cc b/system/test/headless/discovery/discovery.cc index 5244eb893a..34c295188b 100644 --- a/system/test/headless/discovery/discovery.cc +++ b/system/test/headless/discovery/discovery.cc @@ -21,7 +21,6 @@ #include <future> #include "btif/include/btif_api.h" -#include "os/log.h" // android log only #include "stack/include/sdp_api.h" #include "test/headless/bt_property.h" #include "test/headless/get_options.h" diff --git a/system/test/headless/get_options.cc b/system/test/headless/get_options.cc index 3ad9fd48e5..fcab08d45d 100644 --- a/system/test/headless/get_options.cc +++ b/system/test/headless/get_options.cc @@ -23,7 +23,6 @@ #include <sstream> #include <string> -#include "os/log.h" #include "types/bluetooth/uuid.h" #include "types/raw_address.h" diff --git a/system/test/headless/headless.cc b/system/test/headless/headless.cc index ebfcb041ec..5f0d820c7a 100644 --- a/system/test/headless/headless.cc +++ b/system/test/headless/headless.cc @@ -25,7 +25,6 @@ #include <map> #include <memory> -#include "gd/os/log.h" #include "include/hardware/bluetooth.h" #include "test/headless/bt_stack_info.h" #include "test/headless/interface.h" diff --git a/system/test/headless/interface.h b/system/test/headless/interface.h index f06df13a4c..11c314c8b7 100644 --- a/system/test/headless/interface.h +++ b/system/test/headless/interface.h @@ -21,7 +21,6 @@ #include <deque> #include <string> -#include "gd/os/log.h" #include "include/hardware/bluetooth.h" #include "macros.h" #include "test/headless/log.h" diff --git a/system/test/headless/log.cc b/system/test/headless/log.cc index 4714b98c2d..729db46475 100644 --- a/system/test/headless/log.cc +++ b/system/test/headless/log.cc @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "os/log.h" - #include <chrono> #include <ctime> #include <string> diff --git a/system/test/headless/main.cc b/system/test/headless/main.cc index feba9c1909..313b0f1e71 100644 --- a/system/test/headless/main.cc +++ b/system/test/headless/main.cc @@ -25,7 +25,6 @@ #include <iostream> #include <unordered_map> -#include "os/log.h" // android log only #include "test/headless/adapter/adapter.h" #include "test/headless/connect/connect.h" #include "test/headless/discovery/discovery.h" diff --git a/system/test/headless/nop/nop.cc b/system/test/headless/nop/nop.cc index fcae19aa25..5383953608 100644 --- a/system/test/headless/nop/nop.cc +++ b/system/test/headless/nop/nop.cc @@ -20,7 +20,6 @@ #include <future> -#include "os/log.h" // android log only #include "stack/include/sdp_api.h" #include "test/headless/get_options.h" #include "test/headless/headless.h" diff --git a/system/test/headless/property.cc b/system/test/headless/property.cc index 65373f82f9..fe6e21f1ed 100644 --- a/system/test/headless/property.cc +++ b/system/test/headless/property.cc @@ -20,7 +20,6 @@ #include <map> -#include "gd/os/log.h" #include "include/hardware/bluetooth.h" #include "test/headless/log.h" diff --git a/system/test/headless/read/read.cc b/system/test/headless/read/read.cc index 08cf26d8fd..51e29448ac 100644 --- a/system/test/headless/read/read.cc +++ b/system/test/headless/read/read.cc @@ -18,7 +18,6 @@ #include "test/headless/read/read.h" -#include "os/log.h" // android log only #include "test/headless/get_options.h" #include "test/headless/headless.h" #include "test/headless/read/name.h" diff --git a/system/test/headless/scan/scan.cc b/system/test/headless/scan/scan.cc index d72b52236a..58c7bc9bcf 100644 --- a/system/test/headless/scan/scan.cc +++ b/system/test/headless/scan/scan.cc @@ -20,7 +20,6 @@ #include <bluetooth/log.h> -#include "os/log.h" #include "test/headless/get_options.h" #include "test/headless/headless.h" #include "test/headless/interface.h" diff --git a/system/test/headless/text.cc b/system/test/headless/text.cc index dc9303b982..fefc47780d 100644 --- a/system/test/headless/text.cc +++ b/system/test/headless/text.cc @@ -22,7 +22,6 @@ #include "include/hardware/bluetooth.h" #include "macros.h" -#include "os/log.h" std::string bt_conn_direction_text(const bt_conn_direction_t& direction) { switch (direction) { diff --git a/system/test/mock/mock_bta_av_api.h b/system/test/mock/mock_bta_av_api.h index f6319691c0..31fd804f67 100644 --- a/system/test/mock/mock_bta_av_api.h +++ b/system/test/mock/mock_bta_av_api.h @@ -33,7 +33,6 @@ // may need attention to prune from (or add to ) the inclusion set. #include "bta/av/bta_av_int.h" #include "btif/include/btif_av.h" -#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "stack/include/bt_hdr.h" diff --git a/system/udrv/ulinux/uipc.cc b/system/udrv/ulinux/uipc.cc index 464e02b7f1..d0d7de0fbb 100644 --- a/system/udrv/ulinux/uipc.cc +++ b/system/udrv/ulinux/uipc.cc @@ -44,7 +44,6 @@ #include <cerrno> #include <mutex> -#include "os/log.h" #include "osi/include/osi.h" #include "osi/include/socket_utils/sockets.h" |