Merge changes I0caac76d,I77eba112,If765cc42 into main am: 87ffed50ed am: 1841faf972

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

Change-Id: If4e2124a6847172c686ba10d3f0e7980d32e4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

40 files changed, 19 insertions, 78 deletions

diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h
index 06caf10be9..f6026815a6 100644
--- a/system/bta/ag/bta_ag_int.h
+++ b/system/bta/ag/bta_ag_int.h
@@ -34,7 +34,6 @@
 #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/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index c96b867c71..58b7215a04 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -31,7 +31,6 @@
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_sec_api.h"
 #include "bta_api.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/main_thread.h"
 #include "stack/include/port_api.h"
 #include "types/raw_address.h"
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index c9276a6564..d760b113bf 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -53,7 +53,6 @@
 #include "btif/include/btif_config.h"
 #include "hardware/bt_av.h"
 #include "internal_include/bt_target.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/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index aba46a68c6..916b1c0c56 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -59,7 +59,6 @@
 #include "internal_include/bt_trace.h"
 #include "main/shim/le_scanning_manager.h"
 #include "neighbor_inquiry.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/osi.h"
 #include "osi/include/stack_power_telemetry.h"
 #include "stack/btm/btm_sec.h"
diff --git a/system/bta/dm/bta_dm_device_search.cc b/system/bta/dm/bta_dm_device_search.cc
index b11200a074..0dded3c7db 100644
--- a/system/bta/dm/bta_dm_device_search.cc
+++ b/system/bta/dm/bta_dm_device_search.cc
@@ -33,7 +33,6 @@
 #include "common/strings.h"
 #include "device/include/interop.h"
 #include "main/shim/dumpsys.h"
-#include "os/logging/log_adapter.h"
 #include "stack/btm/neighbor_inquiry.h"
 #include "stack/include/bt_dev_class.h"
 #include "stack/include/bt_name.h"
@@ -343,7 +342,7 @@ static void bta_dm_remote_name_cmpl(const tBTA_DM_REMOTE_NAME& remote_name_msg)
                  std::format("status:{} state:{} name:\"{}\"",
                              hci_status_code_text(remote_name_msg.hci_status),
                              bta_dm_state_text(bta_dm_search_get_state()),
-                             PRIVATE_NAME(reinterpret_cast<char const*>(remote_name_msg.bd_name))));
+                             reinterpret_cast<char const*>(remote_name_msg.bd_name)));
 
   tBTM_INQ_INFO* p_btm_inq_info =
           get_btm_client_interface().db.BTM_InqDbRead(remote_name_msg.bd_addr);
diff --git a/system/bta/dm/bta_dm_disc.cc b/system/bta/dm/bta_dm_disc.cc
index 2580e3a2da..0ce2062ff8 100644
--- a/system/bta/dm/bta_dm_disc.cc
+++ b/system/bta/dm/bta_dm_disc.cc
@@ -36,7 +36,6 @@
 #include "device/include/interop.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/dumpsys.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/include/bt_name.h"
diff --git a/system/bta/groups/groups.cc b/system/bta/groups/groups.cc
index 2390a2793e..3d79cdf8d3 100644
--- a/system/bta/groups/groups.cc
+++ b/system/bta/groups/groups.cc
@@ -35,7 +35,6 @@
 
 #include "bta_groups.h"
 #include "btif/include/btif_profile_storage.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
 #include "types/bluetooth/uuid.h"
 #include "types/raw_address.h"
diff --git a/system/bta/has/has_ctp.cc b/system/bta/has/has_ctp.cc
index dbe41442d5..cb99272707 100644
--- a/system/bta/has/has_ctp.cc
+++ b/system/bta/has/has_ctp.cc
@@ -28,7 +28,6 @@
 #include <vector>
 
 #include "has_preset.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
 #include "types/raw_address.h"
 
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index 340e08d992..245b095b07 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -63,7 +63,6 @@
 #include "internal_include/bt_trace.h"
 #include "l2cap_types.h"
 #include "main/shim/entry.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "osi/include/properties.h"
 #include "profiles_api.h"
diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc
index 700e4ab08a..95d871c17c 100644
--- a/system/bta/hf_client/bta_hf_client_at.cc
+++ b/system/bta/hf_client/bta_hf_client_at.cc
@@ -32,7 +32,6 @@
 #include "bta_hfp_api.h"
 #include "bta_sys.h"
 #include "btm_api_types.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
 #include "osi/include/compat.h"
@@ -41,6 +40,11 @@
 #include "stack/include/acl_api.h"
 #include "stack/include/port_api.h"
 
+#define PRIVATE_CELL(number)                                        \
+  (number.replace(0, (number.size() > 2) ? number.size() - 2 : 0,   \
+                  (number.size() > 2) ? number.size() - 2 : 0, '*') \
+           .c_str())
+
 /* Uncomment to enable AT traffic dumping */
 /* #define BTA_HF_CLIENT_AT_DUMP 1 */
 
diff --git a/system/bta/le_audio/device_groups.cc b/system/bta/le_audio/device_groups.cc
index c3fd37b36d..85c230c0b0 100644
--- a/system/bta/le_audio/device_groups.cc
+++ b/system/bta/le_audio/device_groups.cc
@@ -53,7 +53,6 @@
 #include "le_audio_utils.h"
 #include "main/shim/entry.h"
 #include "metrics_collector.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/btm_client_interface.h"
 #include "types/bt_transport.h"
 
diff --git a/system/bta/le_audio/devices.cc b/system/bta/le_audio/devices.cc
index 84253c6fd3..7edb4f1df1 100644
--- a/system/bta/le_audio/devices.cc
+++ b/system/bta/le_audio/devices.cc
@@ -53,7 +53,6 @@
 #include "le_audio_log_history.h"
 #include "le_audio_utils.h"
 #include "main/shim/entry.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "osi/include/properties.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc
index b0729a6f9c..79f1a4a93d 100644
--- a/system/bta/le_audio/le_audio_health_status.cc
+++ b/system/bta/le_audio/le_audio_health_status.cc
@@ -31,7 +31,6 @@
 #include "devices.h"
 #include "hardware/bt_le_audio.h"
 #include "main/shim/metrics_api.h"
-#include "os/logging/log_adapter.h"
 #include "types/raw_address.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 d6848f3f79..95998ca1e6 100644
--- a/system/bta/le_audio/le_audio_log_history.cc
+++ b/system/bta/le_audio/le_audio_log_history.cc
@@ -28,7 +28,6 @@
 #include "common/circular_buffer.h"
 #include "common/strings.h"
 #include "main/shim/dumpsys.h"
-#include "os/logging/log_adapter.h"
 #include "types/raw_address.h"
 
 using namespace bluetooth;
diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc
index c44e3098c7..2fb2963149 100644
--- a/system/bta/le_audio/state_machine.cc
+++ b/system/bta/le_audio/state_machine.cc
@@ -48,7 +48,6 @@
 #include "le_audio_health_status.h"
 #include "le_audio_log_history.h"
 #include "le_audio_types.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "osi/include/osi.h"
 #include "osi/include/properties.h"
diff --git a/system/bta/vc/devices.h b/system/bta/vc/devices.h
index 4c0a105ee8..88c9d4c5e9 100644
--- a/system/bta/vc/devices.h
+++ b/system/bta/vc/devices.h
@@ -25,7 +25,6 @@
 
 #include "bta/include/bta_gatt_api.h"
 #include "bta/vc/types.h"
-#include "os/logging/log_adapter.h"
 #include "types/raw_address.h"
 
 namespace bluetooth {
diff --git a/system/btif/co/bta_av_co.cc b/system/btif/co/bta_av_co.cc
index c9dd6e7b74..d15c6be99f 100644
--- a/system/btif/co/bta_av_co.cc
+++ b/system/btif/co/bta_av_co.cc
@@ -49,7 +49,6 @@
 #include "device/include/device_iot_conf_defs.h"
 #include "device/include/device_iot_config.h"
 #include "include/hardware/bt_av.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "stack/include/a2dp_codec_api.h"
 #include "stack/include/a2dp_constants.h"
diff --git a/system/btif/src/btif_av.cc b/system/btif/src/btif_av.cc
index 5a09cf2581..84bf10c390 100644
--- a/system/btif/src/btif_av.cc
+++ b/system/btif/src/btif_av.cc
@@ -64,7 +64,6 @@
 #include "hardware/bluetooth.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_debug_conn.cc b/system/btif/src/btif_debug_conn.cc
index 935758a876..15d11cd940 100644
--- a/system/btif/src/btif_debug_conn.cc
+++ b/system/btif/src/btif_debug_conn.cc
@@ -21,7 +21,6 @@
 #include <time.h>
 
 #include "common/time_util.h"
-#include "os/logging/log_adapter.h"
 #include "types/raw_address.h"
 
 #define NUM_CONNECTION_EVENTS 16
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index abfea1ced6..cc52ea4cbd 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -74,7 +74,6 @@
 #include "main/shim/le_advertising_manager.h"
 #include "main_thread.h"
 #include "metrics/bluetooth_event.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/properties.h"
 #include "osi/include/stack_power_telemetry.h"
 #include "stack/btm/btm_dev.h"
@@ -970,9 +969,8 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) {
     }
   }
   BTM_LogHistory(kBtmLogTagCallback, bd_addr, "Pin request",
-                 std::format("name:\"{}\" min16:{:c}",
-                             PRIVATE_NAME(reinterpret_cast<char const*>(bd_name.name)),
-                             (p_pin_req->min_16_digit) ? 'T' : 'F'));
+                 std::format("name:\"{}\" min16:{:c}", reinterpret_cast<char const*>(bd_name.name),
+                             p_pin_req->min_16_digit ? 'T' : 'F'));
   GetInterfaceToProfiles()->events->invoke_pin_request_cb(bd_addr, bd_name, cod,
                                                           p_pin_req->min_16_digit);
 }
@@ -1882,7 +1880,7 @@ static void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, co
   GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb(
           status, bd_addr, properties.size(), properties.data());
   log::info("Callback for read name event addr:{} name:{}", bd_addr,
-            PRIVATE_NAME(reinterpret_cast<char const*>(bd_name)));
+            reinterpret_cast<char const*>(bd_name));
 
   if (!during_device_search) {
     return;
@@ -1896,7 +1894,7 @@ static void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, co
     GetInterfaceToProfiles()->events->invoke_device_found_cb(properties.size(), properties.data());
   } else {
     log::info("Skipping device found callback because cod is zero addr:{} name:{}", bd_addr,
-              PRIVATE_NAME(reinterpret_cast<char const*>(bd_name)));
+              reinterpret_cast<char const*>(bd_name));
   }
 }
 
@@ -3586,9 +3584,8 @@ static void btif_dm_ble_passkey_req_evt(tBTA_DM_PIN_REQ* p_pin_req) {
 
   cod = COD_UNCLASSIFIED;
 
-  BTM_LogHistory(
-          kBtmLogTagCallback, bd_addr, "PIN request",
-          std::format("name:'{}'", PRIVATE_NAME(reinterpret_cast<char const*>(bd_name.name))));
+  BTM_LogHistory(kBtmLogTagCallback, bd_addr, "PIN request",
+                 std::format("name:'{}'", reinterpret_cast<char const*>(bd_name.name)));
 
   GetInterfaceToProfiles()->events->invoke_pin_request_cb(bd_addr, bd_name, cod, false);
 }
diff --git a/system/btif/src/btif_hf.cc b/system/btif/src/btif_hf.cc
index bd607ea142..7e6fa5fef3 100644
--- a/system/btif/src/btif_hf.cc
+++ b/system/btif/src/btif_hf.cc
@@ -63,13 +63,17 @@
 #include "include/hardware/bluetooth_headset_interface.h"
 #include "include/hardware/bt_hf.h"
 #include "internal_include/bt_target.h"
-#include "os/logging/log_adapter.h"
 #include "stack/btm/btm_sco_hfp_hal.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_log_history.h"
 #include "types/raw_address.h"
 
+#define PRIVATE_CELL(number)                                        \
+  (number.replace(0, (number.size() > 2) ? number.size() - 2 : 0,   \
+                  (number.size() > 2) ? number.size() - 2 : 0, '*') \
+           .c_str())
+
 namespace {
 constexpr char kBtmLogTag[] = "HFP";
 }
diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc
index 72c4bdd690..1cd0f48b91 100644
--- a/system/btif/src/btif_rc.cc
+++ b/system/btif/src/btif_rc.cc
@@ -46,7 +46,6 @@
 #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/btif/src/btif_sock_logging.cc b/system/btif/src/btif_sock_logging.cc
index 338a47f2f1..acb38f7de5 100644
--- a/system/btif/src/btif_sock_logging.cc
+++ b/system/btif/src/btif_sock_logging.cc
@@ -25,7 +25,6 @@
 
 #include "btif/include/btif_metrics_logging.h"
 #include "btif/include/btif_sock.h"
-#include "os/logging/log_adapter.h"
 #include "types/raw_address.h"
 
 #define SOCK_LOGGER_SIZE_MAX 16
diff --git a/system/gd/hci/address.h b/system/gd/hci/address.h
index 10a817cc1c..17c2fce6b4 100644
--- a/system/gd/hci/address.h
+++ b/system/gd/hci/address.h
@@ -25,7 +25,6 @@
 #include <ostream>
 #include <string>
 
-#include "os/logging/log_adapter.h"
 #include "packet/custom_field_fixed_size_interface.h"
 #include "storage/serializable.h"
 
diff --git a/system/gd/hci/address_with_type.h b/system/gd/hci/address_with_type.h
index 350b88df75..26c35e814d 100644
--- a/system/gd/hci/address_with_type.h
+++ b/system/gd/hci/address_with_type.h
@@ -26,7 +26,6 @@
 #include "hci/address.h"
 #include "hci/hci_packets.h"
 #include "hci/octets.h"
-#include "os/logging/log_adapter.h"
 
 namespace bluetooth {
 namespace hci {
diff --git a/system/gd/os/logging/log_adapter.h b/system/gd/os/logging/log_adapter.h
deleted file mode 100644
index 0da4866fec..0000000000
--- a/system/gd/os/logging/log_adapter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- *
- *  Copyright 2022 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 <string>
-
-#define PRIVATE_CELL(number)                                        \
-  (number.replace(0, (number.size() > 2) ? number.size() - 2 : 0,   \
-                  (number.size() > 2) ? number.size() - 2 : 0, '*') \
-           .c_str())
-
-#define PRIVATE_NAME(name) (name)
diff --git a/system/internal_include/bt_trace.h b/system/internal_include/bt_trace.h
index 5bd07ca0e0..3b8b7166b4 100644
--- a/system/internal_include/bt_trace.h
+++ b/system/internal_include/bt_trace.h
@@ -29,8 +29,6 @@
 #include <sstream>
 #include <type_traits>
 
-#include "os/logging/log_adapter.h"
-
 /* Prints integral parameter x as hex string, with '0' fill */
 template <typename T>
 std::string loghex(T x) {
diff --git a/system/osi/src/stack_power_telemetry.cc b/system/osi/src/stack_power_telemetry.cc
index 18199bcd18..52d5bfcd2a 100644
--- a/system/osi/src/stack_power_telemetry.cc
+++ b/system/osi/src/stack_power_telemetry.cc
@@ -28,7 +28,6 @@
 #include <map>
 #include <mutex>
 
-#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/pdl/hci/include/hci/address.h b/system/pdl/hci/include/hci/address.h
index 7694689bf2..0d258ed0ff 100644
--- a/system/pdl/hci/include/hci/address.h
+++ b/system/pdl/hci/include/hci/address.h
@@ -25,7 +25,6 @@
 #include <ostream>
 #include <string>
 
-#include "os/logging/log_adapter.h"
 #include "packet/custom_field_fixed_size_interface.h"
 #include "storage/serializable.h"
 
diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc
index 3a979e9c3a..adad0da41d 100644
--- a/system/stack/avdt/avdt_api.cc
+++ b/system/stack/avdt/avdt_api.cc
@@ -39,7 +39,6 @@
 #include "avdtc_api.h"
 #include "bta/include/bta_sec_api.h"
 #include "internal_include/bt_target.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "stack/include/a2dp_codec_api.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index 03eeb89814..3071306446 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -2167,7 +2167,7 @@ tBTM_SEC_DEV_REC* btm_rnr_add_name_to_security_record(const RawAddress* p_bd_add
 
   BTM_LogHistory(kBtmLogTag, (p_bd_addr) ? *p_bd_addr : RawAddress::kEmpty, "RNR complete",
                  std::format("hci_status:{} name:{}", hci_error_code_text(hci_status),
-                             PRIVATE_NAME(reinterpret_cast<char const*>(p_bd_name))));
+                             reinterpret_cast<char const*>(p_bd_name)));
 
   if (p_dev_rec == nullptr) {
     // We need to send the callbacks to complete the RNR cycle despite failure
diff --git a/system/stack/btm/security_device_record.h b/system/stack/btm/security_device_record.h
index 94e48753d2..61a6d182a6 100644
--- a/system/stack/btm/security_device_record.h
+++ b/system/stack/btm/security_device_record.h
@@ -25,7 +25,6 @@
 
 #include "internal_include/bt_target.h"
 #include "macros.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"
@@ -330,7 +329,7 @@ public:
             "name:\"{}\" sec_prop:{}",
             bd_addr, DeviceTypeText(device_type), dev_class_text(dev_class),
             remote_version_info.ToString(), sm4, remote_supports_secure_connections ? 'T' : 'F',
-            PRIVATE_NAME(reinterpret_cast<char const*>(sec_bd_name)), sec_rec.ToString());
+            reinterpret_cast<char const*>(sec_bd_name), sec_rec.ToString());
   }
 
 public:
diff --git a/system/stack/connection_manager/connection_manager.cc b/system/stack/connection_manager/connection_manager.cc
index 11d4637b56..25c9ee57ac 100644
--- a/system/stack/connection_manager/connection_manager.cc
+++ b/system/stack/connection_manager/connection_manager.cc
@@ -31,7 +31,6 @@
 #include "main/shim/acl_api.h"
 #include "main/shim/entry.h"
 #include "main/shim/le_scanning_manager.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/include/advertise_data_parser.h"
diff --git a/system/stack/eatt/eatt.h b/system/stack/eatt/eatt.h
index c47509def7..b4ab901551 100644
--- a/system/stack/eatt/eatt.h
+++ b/system/stack/eatt/eatt.h
@@ -21,7 +21,6 @@
 #include <deque>
 #include <memory>
 
-#include "os/logging/log_adapter.h"
 #include "stack/gatt/gatt_int.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h
index db0d0da9ca..70ff37546f 100644
--- a/system/stack/gatt/gatt_int.h
+++ b/system/stack/gatt/gatt_int.h
@@ -33,7 +33,6 @@
 #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/pan/pan_api.cc b/system/stack/pan/pan_api.cc
index 432a071ec7..8650b5d464 100644
--- a/system/stack/pan/pan_api.cc
+++ b/system/stack/pan/pan_api.cc
@@ -36,7 +36,6 @@
 #include "bta/sys/bta_sys.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/dumpsys.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/rfcomm/port_api.cc b/system/stack/rfcomm/port_api.cc
index f5f0274990..d74d4d1835 100644
--- a/system/stack/rfcomm/port_api.cc
+++ b/system/stack/rfcomm/port_api.cc
@@ -32,7 +32,6 @@
 #include <cstdint>
 
 #include "internal_include/bt_trace.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "osi/include/mutex.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/rfcomm/port_rfc.cc b/system/stack/rfcomm/port_rfc.cc
index 01c8270869..a4cf8d5adf 100644
--- a/system/stack/rfcomm/port_rfc.cc
+++ b/system/stack/rfcomm/port_rfc.cc
@@ -36,7 +36,6 @@
 #include "internal_include/bt_target.h"
 #include "internal_include/bt_trace.h"
 #include "main/shim/entry.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "osi/include/mutex.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/rfcomm/rfc_ts_frames.cc b/system/stack/rfcomm/rfc_ts_frames.cc
index 77251ed8c7..957ace7b7f 100644
--- a/system/stack/rfcomm/rfc_ts_frames.cc
+++ b/system/stack/rfcomm/rfc_ts_frames.cc
@@ -28,7 +28,6 @@
 
 #include <cstdint>
 
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/rfcdefs.h"
diff --git a/system/stack/rfcomm/rfc_utils.cc b/system/stack/rfcomm/rfc_utils.cc
index 8f99c6ee98..55c30bb604 100644
--- a/system/stack/rfcomm/rfc_utils.cc
+++ b/system/stack/rfcomm/rfc_utils.cc
@@ -29,7 +29,6 @@
 #include <cstdint>
 
 #include "internal_include/bt_target.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/port_ext.h"