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

Commit 87ffed50 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes I0caac76d,I77eba112,If765cc42 into main 

* changes:
  Remove gd/os/logging/log_adapter.h
  Copy PRIVATE_CELL where it is used
  Remove PRIVATE_NAME
parents c7c5ba8e bee06e1a

system/bta/ag/bta_ag_int.h

+0 −1
Original line number Diff line number Diff line
@@ -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"

system/bta/ag/bta_ag_rfc.cc

+0 −1
Original line number Diff line number Diff line
@@ -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"

system/bta/av/bta_av_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -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"

system/bta/csis/csis_client.cc

+0 −1
Original line number Diff line number Diff line
@@ -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"

system/bta/dm/bta_dm_device_search.cc

+1 −2
Original line number Diff line number Diff line
@@ -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);