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

Commit 3ea33be1 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Drop dependency on shim/dumpsys.h 

Bug: 301661850
Test: mma packages/modules/Bluetooth
Change-Id: Iabc7e3e88dc0b9831420d199bca062ace8bad917
parent 5a3f0fa6

system/bta/dm/bta_dm_gatt_client.cc

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "bta/include/bta_gatt_api.h"

#include "gd/common/strings.h"

#include "main/shim/dumpsys.h"

#include "stack/btm/btm_int_types.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/gd/os/logging/log_adapter.h

+11 −0
Original line number Diff line number Diff line
@@ -37,3 +37,14 @@ std::string ToLoggableStr(const Loggable& loggable) { 


#define ADDRESS_TO_LOGGABLE_STR(addr) ToLoggableStr(addr)

#define ADDRESS_TO_LOGGABLE_CSTR(addr) ADDRESS_TO_LOGGABLE_STR(addr).c_str()



#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)

system/main/shim/dumpsys.h

+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ 
    dprintf(fd, " ----- %s -----\n", title); \

  } while (false)



#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)



inline double ticks_to_seconds(uint16_t ticks) {

  return (static_cast<double>(ticks) * 0.625 * 0.001);

}

system/main/test/main_shim_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "main/shim/acl.h"

#include "main/shim/acl_legacy_interface.h"

#include "main/shim/ble_scanner_interface_impl.h"

#include "main/shim/dumpsys.h"

#include "main/shim/helpers.h"

#include "main/shim/le_advertising_manager.h"

#include "main/shim/le_scanning_manager.h"

system/stack/btm/security_device_record.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <string>



#include "bt_target.h"

#include "main/shim/dumpsys.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"