diff options
| author | 2021-09-10 23:05:47 -0700 | |
|---|---|---|
| committer | 2021-09-24 04:10:43 +0000 | |
| commit | 2a9d9f2de4f7ec791933093069890067a457afb0 (patch) | |
| tree | 8d37c7c468ffc4c15319606c38fe55c564c5386a | |
| parent | d6cbecced12b73bc4d2811a17dbebed8281d1f14 (diff) | |
legacy: Explicitly include types/raw_address
Bug: 197478351
Tag: #refactor
Test: gd/cert/run
Change-Id: I6eedcf3455ab278094a2e4e47f8cede84d96fd25
367 files changed, 691 insertions, 227 deletions
diff --git a/system/audio_hal_interface/a2dp_encoding.cc b/system/audio_hal_interface/a2dp_encoding.cc index 6eb78c92ee..abfa9439be 100644 --- a/system/audio_hal_interface/a2dp_encoding.cc +++ b/system/audio_hal_interface/a2dp_encoding.cc @@ -16,16 +16,17 @@ #define LOG_TAG "a2dp_encoding" #include "a2dp_encoding.h" -#include "client_interface.h" -#include "codec_status.h" #include "a2dp_sbc_constants.h" #include "btif_a2dp_source.h" #include "btif_av.h" #include "btif_av_co.h" #include "btif_hf.h" +#include "client_interface.h" +#include "codec_status.h" #include "osi/include/log.h" #include "osi/include/properties.h" +#include "types/raw_address.h" namespace { diff --git a/system/audio_hal_interface/a2dp_encoding_host.cc b/system/audio_hal_interface/a2dp_encoding_host.cc index 9bbfdf4f6a..1d10617021 100644 --- a/system/audio_hal_interface/a2dp_encoding_host.cc +++ b/system/audio_hal_interface/a2dp_encoding_host.cc @@ -30,6 +30,7 @@ #include "btif_hf.h" #include "osi/include/log.h" #include "osi/include/properties.h" +#include "types/raw_address.h" #include "udrv/include/uipc.h" #define A2DP_DATA_READ_POLL_MS 10 diff --git a/system/binder/android/bluetooth/bluetooth_device.cc b/system/binder/android/bluetooth/bluetooth_device.cc index e291ba2b83..4247cf9995 100644 --- a/system/binder/android/bluetooth/bluetooth_device.cc +++ b/system/binder/android/bluetooth/bluetooth_device.cc @@ -18,6 +18,8 @@ #include <utils/String16.h> +#include "types/raw_address.h" + using android::OK; using android::Parcel; using android::status_t; @@ -43,4 +45,4 @@ status_t BluetoothDevice::readFromParcel(const Parcel* parcel) { } } // namespace bluetooth -} // namespace android
\ No newline at end of file +} // namespace android diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc index 05faafcbbe..f46536124f 100644 --- a/system/bta/ag/bta_ag_act.cc +++ b/system/bta/ag/bta_ag_act.cc @@ -31,6 +31,7 @@ #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/l2c_api.h" #include "stack/include/port_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/ag/bta_ag_api.cc b/system/bta/ag/bta_ag_api.cc index a4010b63d4..34479cbfe0 100644 --- a/system/bta/ag/bta_ag_api.cc +++ b/system/bta/ag/bta_ag_api.cc @@ -24,15 +24,18 @@ * ******************************************************************************/ +#include "bta/include/bta_ag_api.h" + #include <base/bind.h> #include <base/location.h> + #include <cstdint> #include <cstring> #include <vector> #include "bta/ag/bta_ag_int.h" -#include "bta/include/bta_ag_api.h" #include "stack/include/btu.h" // do_in_main_thread +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h index c3aa553571..b1dd804e05 100644 --- a/system/bta/ag/bta_ag_int.h +++ b/system/bta/ag/bta_ag_int.h @@ -31,6 +31,7 @@ #include "bta/include/bta_api.h" #include "bta/sys/bta_sys.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc index 867bc47477..c9fd6a2584 100644 --- a/system/bta/ag/bta_ag_main.cc +++ b/system/bta/ag/bta_ag_main.cc @@ -33,6 +33,7 @@ #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" #include "stack/include/btm_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and types diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc index 7767739a94..9b7e5e06d7 100644 --- a/system/bta/ag/bta_ag_rfc.cc +++ b/system/bta/ag/bta_ag_rfc.cc @@ -24,12 +24,14 @@ ******************************************************************************/ #include <base/bind.h> + #include <cstring> #include "bta/ag/bta_ag_int.h" #include "osi/include/osi.h" #include "stack/include/btu.h" // do_in_main_thread #include "stack/include/port_api.h" +#include "types/raw_address.h" /* Event mask for RfCOMM port callback */ #define BTA_AG_PORT_EV_MASK PORT_EV_RXCHAR diff --git a/system/bta/ar/bta_ar.cc b/system/bta/ar/bta_ar.cc index 4dda718c53..ea6108f967 100644 --- a/system/bta/ar/bta_ar.cc +++ b/system/bta/ar/bta_ar.cc @@ -28,6 +28,7 @@ #include "bta/sys/bta_sys.h" #include "stack/include/avct_api.h" #include "stack/include/avrc_api.h" +#include "types/raw_address.h" /* AV control block */ tBTA_AR_CB bta_ar_cb; diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc index c86e1943f9..585c552419 100644 --- a/system/bta/av/bta_av_aact.cc +++ b/system/bta/av/bta_av_aact.cc @@ -53,6 +53,7 @@ #include "stack/include/btm_client_interface.h" #include "stack/include/l2c_api.h" #include "types/hci_role.h" +#include "types/raw_address.h" namespace { diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc index ad6250838f..9a8ccfd688 100644 --- a/system/bta/av/bta_av_api.cc +++ b/system/bta/av/bta_av_api.cc @@ -32,6 +32,7 @@ #include "osi/include/compat.h" #include "osi/include/log.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/av/bta_av_int.h b/system/bta/av/bta_av_int.h index ae147d8439..e97a24be6d 100644 --- a/system/bta/av/bta_av_int.h +++ b/system/bta/av/bta_av_int.h @@ -35,6 +35,7 @@ #include "stack/include/avdt_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" #define CASE_RETURN_TEXT(code) \ case code: \ diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc index fa63e21d96..fbcb6cc45c 100644 --- a/system/bta/av/bta_av_main.cc +++ b/system/bta/av/bta_av_main.cc @@ -41,6 +41,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "types/hci_role.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and types diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h index 1aaf745bae..ad741d68cd 100644 --- a/system/bta/dm/bta_dm_int.h +++ b/system/bta/dm/bta_dm_int.h @@ -35,6 +35,7 @@ #include "bta/sys/bta_sys.h" #include "main/shim/dumpsys.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef CASE_RETURN_TEXT #define CASE_RETURN_TEXT(code) \ diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc index 7e8c63fb40..be9f2620fe 100644 --- a/system/bta/gatt/bta_gattc_api.cc +++ b/system/bta/gatt/bta_gattc_api.cc @@ -37,6 +37,7 @@ #include "stack/include/btu.h" // do_in_main_thread #include "types/bluetooth/uuid.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc index 44d9465bfc..0e21dbba52 100644 --- a/system/bta/gatt/bta_gattc_cache.cc +++ b/system/bta/gatt/bta_gattc_cache.cc @@ -26,12 +26,12 @@ #define LOG_TAG "bt_bta_gattc" #include <base/strings/stringprintf.h> + #include <cstdint> #include <cstdio> #include <sstream> #include "bt_target.h" // Must be first to define build configuration - #include "bta/gatt/bta_gattc_int.h" #include "bta/gatt/database.h" #include "osi/include/allocator.h" @@ -39,6 +39,7 @@ #include "stack/btm/btm_sec.h" #include "stack/include/gatt_api.h" #include "types/bluetooth/uuid.h" +#include "types/raw_address.h" using base::StringPrintf; using bluetooth::Uuid; diff --git a/system/bta/gatt/bta_gattc_int.h b/system/bta/gatt/bta_gattc_int.h index d7f60d09ef..4d58404947 100644 --- a/system/bta/gatt/bta_gattc_int.h +++ b/system/bta/gatt/bta_gattc_int.h @@ -34,6 +34,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/gatt_api.h" #include "types/bt_transport.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc index 8a99a79d2a..1c65bde2b4 100644 --- a/system/bta/gatt/bta_gatts_act.cc +++ b/system/bta/gatt/bta_gatts_act.cc @@ -26,13 +26,13 @@ #include <cstdint> #include "bt_target.h" // Must be first to define build configuration - #include "bta/gatt/bta_gatts_int.h" #include "bta/include/bta_api.h" #include "btif/include/btif_debug_conn.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/gatt_api.h" +#include "types/raw_address.h" static void bta_gatts_nv_save_cback(bool is_saved, tGATTS_HNDL_RANGE* p_hndl_range); diff --git a/system/bta/gatt/bta_gatts_int.h b/system/bta/gatt/bta_gatts_int.h index 55935ff623..e624cbca9e 100644 --- a/system/bta/gatt/bta_gatts_int.h +++ b/system/bta/gatt/bta_gatts_int.h @@ -33,6 +33,7 @@ #include "stack/include/bt_types.h" #include "stack/include/btm_ble_api_types.h" #include "stack/include/gatt_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/hd/bta_hd_api.cc b/system/bta/hd/bta_hd_api.cc index 893f351ec6..0259a227a0 100644 --- a/system/bta/hd/bta_hd_api.cc +++ b/system/bta/hd/bta_hd_api.cc @@ -34,6 +34,7 @@ #include "osi/include/compat.h" #include "osi/include/log.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc index d47837282a..0633153191 100644 --- a/system/bta/hf_client/bta_hf_client_main.cc +++ b/system/bta/hf_client/bta_hf_client_main.cc @@ -26,6 +26,7 @@ #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/bt_hdr.h" #include "stack/include/btm_api.h" +#include "types/raw_address.h" static const char* bta_hf_client_evt_str(uint16_t event); static const char* bta_hf_client_state_str(uint8_t state); diff --git a/system/bta/hf_client/bta_hf_client_rfc.cc b/system/bta/hf_client/bta_hf_client_rfc.cc index 42c3d3ab80..6cb2414a3b 100644 --- a/system/bta/hf_client/bta_hf_client_rfc.cc +++ b/system/bta/hf_client/bta_hf_client_rfc.cc @@ -31,6 +31,7 @@ #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/port_api.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/bta/hh/bta_hh_int.h b/system/bta/hh/bta_hh_int.h index f8371435bb..1a4d0edb8e 100644 --- a/system/bta/hh/bta_hh_int.h +++ b/system/bta/hh/bta_hh_int.h @@ -33,6 +33,7 @@ #include "bta/sys/bta_sys.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" /* state machine events, these events are handled by the state machine */ enum tBTA_HH_INT_EVT : uint16_t { diff --git a/system/bta/include/bta_ar_api.h b/system/bta/include/bta_ar_api.h index 6b57096e86..8e4483a6fe 100644 --- a/system/bta/include/bta_ar_api.h +++ b/system/bta/include/bta_ar_api.h @@ -30,6 +30,7 @@ #include "bta/sys/bta_sys.h" #include "stack/include/avdt_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/include/bta_av_api.h b/system/bta/include/bta_av_api.h index 431874984c..69f8cbd61a 100644 --- a/system/bta/include/bta_av_api.h +++ b/system/bta/include/bta_av_api.h @@ -32,6 +32,7 @@ #include "stack/include/avrc_defs.h" #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/include/bta_hearing_aid_api.h b/system/bta/include/bta_hearing_aid_api.h index 613802a211..b7ac365335 100644 --- a/system/bta/include/bta_hearing_aid_api.h +++ b/system/bta/include/bta_hearing_aid_api.h @@ -20,11 +20,14 @@ #include <base/callback_forward.h> #include <hardware/bt_hearing_aid.h> + #include <cstdint> #include <deque> #include <functional> #include <vector> +#include "types/raw_address.h" + constexpr uint16_t HEARINGAID_MAX_NUM_UUIDS = 1; constexpr uint16_t HA_INTERVAL_10_MS = 10; diff --git a/system/bta/include/bta_hh_api.h b/system/bta/include/bta_hh_api.h index 9d0ac5224b..afc9ddc26e 100644 --- a/system/bta/include/bta_hh_api.h +++ b/system/bta/include/bta_hh_api.h @@ -26,6 +26,7 @@ #include "bta/include/bta_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/hiddefs.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and Type Definitions diff --git a/system/bta/include/bta_hh_co.h b/system/bta/include/bta_hh_co.h index 13141fe456..769c88ca38 100644 --- a/system/bta/include/bta_hh_co.h +++ b/system/bta/include/bta_hh_co.h @@ -27,6 +27,7 @@ #include <cstdint> #include "bta/include/bta_hh_api.h" +#include "types/raw_address.h" typedef struct { uint16_t rpt_uuid; diff --git a/system/bta/include/bta_jv_api.h b/system/bta/include/bta_jv_api.h index 0f9d9b4056..213ceb2e50 100644 --- a/system/bta/include/bta_jv_api.h +++ b/system/bta/include/bta_jv_api.h @@ -31,6 +31,7 @@ #include "bta/include/bta_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/l2c_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/include/bta_pan_ci.h b/system/bta/include/bta_pan_ci.h index badd802fbb..8bbf53e2bd 100644 --- a/system/bta/include/bta_pan_ci.h +++ b/system/bta/include/bta_pan_ci.h @@ -28,6 +28,7 @@ #include "bta/include/bta_pan_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Function Declarations diff --git a/system/bta/include/bta_vc_api.h b/system/bta/include/bta_vc_api.h index 66a47cd113..8a1370e8c1 100644 --- a/system/bta/include/bta_vc_api.h +++ b/system/bta/include/bta_vc_api.h @@ -19,6 +19,8 @@ #include <hardware/bt_vc.h> +#include "types/raw_address.h" + class VolumeControl { public: virtual ~VolumeControl() = default; diff --git a/system/bta/jv/bta_jv_int.h b/system/bta/jv/bta_jv_int.h index 3e17451f76..86bf741b85 100644 --- a/system/bta/jv/bta_jv_int.h +++ b/system/bta/jv/bta_jv_int.h @@ -30,6 +30,7 @@ #include "bta/include/bta_jv_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/rfcdefs.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/sdp/bta_sdp_api.cc b/system/bta/sdp/bta_sdp_api.cc index c334719941..4d98e00367 100644 --- a/system/bta/sdp/bta_sdp_api.cc +++ b/system/bta/sdp/bta_sdp_api.cc @@ -22,13 +22,15 @@ * ******************************************************************************/ +#include "bta/include/bta_sdp_api.h" + #include <base/bind.h> #include <base/location.h> #include "bt_target.h" // Must be first to define build configuration -#include "bta/include/bta_sdp_api.h" #include "bta/sdp/bta_sdp_int.h" #include "stack/include/btu.h" // do_in_main_thread +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/bta/sys/bta_sys.h b/system/bta/sys/bta_sys.h index d219f70e4c..fa5b115104 100644 --- a/system/bta/sys/bta_sys.h +++ b/system/bta/sys/bta_sys.h @@ -33,6 +33,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/hci_error_code.h" #include "types/hci_role.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and data types diff --git a/system/bta/test/bta_dip_test.cc b/system/bta/test/bta_dip_test.cc index 9b010e59e4..de0e18a1b1 100644 --- a/system/bta/test/bta_dip_test.cc +++ b/system/bta/test/bta_dip_test.cc @@ -17,8 +17,10 @@ ******************************************************************************/ #include <gtest/gtest.h> + #include "bta/sdp/bta_sdp_act.cc" #include "stack/sdp/sdp_api.cc" +#include "types/raw_address.h" namespace { const RawAddress bdaddr({0x11, 0x22, 0x33, 0x44, 0x55, 0x66}); diff --git a/system/bta/test/bta_hf_client_test.cc b/system/bta/test/bta_hf_client_test.cc index d906a9dd1c..92a669d067 100644 --- a/system/bta/test/bta_hf_client_test.cc +++ b/system/bta/test/bta_hf_client_test.cc @@ -21,6 +21,7 @@ #include "bta/hf_client/bta_hf_client_int.h" #include "bta/include/bta_hf_client_api.h" #include "common/message_loop_thread.h" +#include "types/raw_address.h" namespace base { class MessageLoop; diff --git a/system/bta/test/common/bta_gatt_api_mock.cc b/system/bta/test/common/bta_gatt_api_mock.cc index fb66f9df97..305ae1567a 100644 --- a/system/bta/test/common/bta_gatt_api_mock.cc +++ b/system/bta/test/common/bta_gatt_api_mock.cc @@ -17,6 +17,8 @@ #include "bta_gatt_api_mock.h" +#include "types/raw_address.h" + static gatt::MockBtaGattInterface* gatt_interface = nullptr; void gatt::SetMockBtaGattInterface( diff --git a/system/bta/test/common/bta_gatt_api_mock.h b/system/bta/test/common/bta_gatt_api_mock.h index cc6d8e0e06..8b9b1475e3 100644 --- a/system/bta/test/common/bta_gatt_api_mock.h +++ b/system/bta/test/common/bta_gatt_api_mock.h @@ -20,6 +20,7 @@ #include <gmock/gmock.h> #include "bta_gatt_api.h" +#include "types/raw_address.h" namespace gatt { diff --git a/system/bta/test/common/btm_api_mock.cc b/system/bta/test/common/btm_api_mock.cc index 33793c4fc8..0fde32d17e 100644 --- a/system/bta/test/common/btm_api_mock.cc +++ b/system/bta/test/common/btm_api_mock.cc @@ -17,6 +17,8 @@ #include "btm_api_mock.h" +#include "types/raw_address.h" + static bluetooth::manager::MockBtmInterface* btm_interface = nullptr; void bluetooth::manager::SetMockBtmInterface( diff --git a/system/bta/test/common/btm_api_mock.h b/system/bta/test/common/btm_api_mock.h index 9182818b28..34b8e4056e 100644 --- a/system/bta/test/common/btm_api_mock.h +++ b/system/bta/test/common/btm_api_mock.h @@ -20,6 +20,7 @@ #include "btm_api.h" #include "stack/btm/security_device_record.h" +#include "types/raw_address.h" namespace bluetooth { namespace manager { diff --git a/system/bta/vc/devices_test.cc b/system/bta/vc/devices_test.cc index 6763406096..d868a17ddd 100644 --- a/system/bta/vc/devices_test.cc +++ b/system/bta/vc/devices_test.cc @@ -26,6 +26,7 @@ #include "bta_gatt_queue_mock.h" #include "btm_api_mock.h" #include "gatt/database_builder.h" +#include "types/raw_address.h" namespace bluetooth { namespace vc { diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc index b4f11dc598..4fb789ed8a 100644 --- a/system/bta/vc/vc.cc +++ b/system/bta/vc/vc.cc @@ -29,6 +29,7 @@ #include "bta_vc_api.h" #include "btif_storage.h" #include "devices.h" +#include "types/raw_address.h" using base::Closure; using bluetooth::Uuid; diff --git a/system/bta/vc/vc_test.cc b/system/bta/vc/vc_test.cc index 69fe509baa..f82feb5482 100644 --- a/system/bta/vc/vc_test.cc +++ b/system/bta/vc/vc_test.cc @@ -27,6 +27,7 @@ #include "gatt/database_builder.h" #include "hardware/bt_gatt_types.h" #include "types.h" +#include "types/raw_address.h" void btif_storage_add_volume_control(const RawAddress& addr, bool auto_conn) {} diff --git a/system/btcore/fuzzer/btcore_property_fuzzer.cpp b/system/btcore/fuzzer/btcore_property_fuzzer.cpp index 933efc4794..4065365d43 100644 --- a/system/btcore/fuzzer/btcore_property_fuzzer.cpp +++ b/system/btcore/fuzzer/btcore_property_fuzzer.cpp @@ -16,7 +16,9 @@ */ #include <fuzzer/FuzzedDataProvider.h> + #include "btcore/include/property.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btcore/include/property.h b/system/btcore/include/property.h index b11cf7f2fd..73d4d41e7c 100644 --- a/system/btcore/include/property.h +++ b/system/btcore/include/property.h @@ -24,6 +24,7 @@ #include <stdlib.h> #include "btcore/include/device_class.h" +#include "types/raw_address.h" // Copies an array of consecutive properties of |count| to a newly // allocated array. |properties| must not be NULL. diff --git a/system/btcore/src/property.cc b/system/btcore/src/property.cc index ee78a3ebe4..4778b724dc 100644 --- a/system/btcore/src/property.cc +++ b/system/btcore/src/property.cc @@ -17,12 +17,15 @@ ******************************************************************************/ #include "btcore/include/property.h" + #include <base/logging.h> #include <string.h> + #include "btcore/include/device_class.h" #include "check.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btcore/test/property_test.cc b/system/btcore/test/property_test.cc index 72eac76e2b..c62d8643cf 100644 --- a/system/btcore/test/property_test.cc +++ b/system/btcore/test/property_test.cc @@ -16,11 +16,13 @@ * ******************************************************************************/ +#include "btcore/include/property.h" + #include <arpa/inet.h> #include <gtest/gtest.h> -#include "osi/test/AllocationTestHarness.h" -#include "btcore/include/property.h" +#include "osi/test/AllocationTestHarness.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btif/avrcp/avrcp_service.cc b/system/btif/avrcp/avrcp_service.cc index 68c59168fa..8ffe2979dc 100644 --- a/system/btif/avrcp/avrcp_service.cc +++ b/system/btif/avrcp/avrcp_service.cc @@ -32,6 +32,7 @@ #include "device.h" #include "stack/include/bt_hdr.h" #include "stack/include/btu.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { diff --git a/system/btif/co/bta_av_co.cc b/system/btif/co/bta_av_co.cc index 63b8c1fdff..bd78c0d430 100644 --- a/system/btif/co/bta_av_co.cc +++ b/system/btif/co/bta_av_co.cc @@ -37,6 +37,7 @@ #include "stack/include/a2dp_error_codes.h" #include "stack/include/avdt_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" // Macro to retrieve the number of elements in a statically allocated array #define BTA_AV_CO_NUM_ELEMENTS(__a) (sizeof(__a) / sizeof((__a)[0])) diff --git a/system/btif/co/bta_gatts_co.cc b/system/btif/co/bta_gatts_co.cc index 1767b34bc6..b0056d603e 100644 --- a/system/btif/co/bta_gatts_co.cc +++ b/system/btif/co/bta_gatts_co.cc @@ -16,13 +16,14 @@ * ******************************************************************************/ -#include "bta_api.h" - #include <stdlib.h> #include <string.h> + +#include "bta_api.h" #include "btif_util.h" #include "osi/include/osi.h" #include "stack/include/gatt_api.h" +#include "types/raw_address.h" /***************************************************************************** * Local type definitions diff --git a/system/btif/co/bta_hh_co.cc b/system/btif/co/bta_hh_co.cc index eb7790f498..5ab793231a 100644 --- a/system/btif/co/bta_hh_co.cc +++ b/system/btif/co/bta_hh_co.cc @@ -16,6 +16,8 @@ * ******************************************************************************/ +#include "bta_hh_co.h" + #include <base/logging.h> #include <ctype.h> #include <errno.h> @@ -30,12 +32,12 @@ #include "bta_api.h" #include "bta_hh_api.h" -#include "bta_hh_co.h" #include "btif_hh.h" #include "btif_util.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/osi.h" +#include "types/raw_address.h" const char* dev_path = "/dev/uhid"; diff --git a/system/btif/co/bta_pan_co.cc b/system/btif/co/bta_pan_co.cc index 982638ad53..0214e37ffc 100644 --- a/system/btif/co/bta_pan_co.cc +++ b/system/btif/co/bta_pan_co.cc @@ -41,6 +41,7 @@ #include "osi/include/osi.h" #include "pan_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/btif/include/btif_a2dp.h b/system/btif/include/btif_a2dp.h index a4e73ac689..c4d95618b0 100644 --- a/system/btif/include/btif_a2dp.h +++ b/system/btif/include/btif_a2dp.h @@ -23,6 +23,7 @@ #include <stdbool.h> #include "bta/include/bta_av_api.h" +#include "types/raw_address.h" // Process 'idle' request from the BTIF state machine during initialization. void btif_a2dp_on_idle(void); diff --git a/system/btif/include/btif_api.h b/system/btif/include/btif_api.h index 3a7c2d7f77..433640a1f2 100644 --- a/system/btif/include/btif_api.h +++ b/system/btif/include/btif_api.h @@ -34,6 +34,7 @@ #include "btif_common.h" #include "btif_dm.h" +#include "types/raw_address.h" /******************************************************************************* * BTIF CORE API diff --git a/system/btif/include/btif_av_co.h b/system/btif/include/btif_av_co.h index f9c2ed857e..1ce810f5e3 100644 --- a/system/btif/include/btif_av_co.h +++ b/system/btif/include/btif_av_co.h @@ -21,6 +21,7 @@ #include "btif/include/btif_a2dp_source.h" #include "stack/include/a2dp_codec_api.h" +#include "types/raw_address.h" // Sets the active peer to |peer_addr|. // Returns true on success, otherwise false. diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h index f2c1093931..66bf9faf33 100644 --- a/system/btif/include/btif_common.h +++ b/system/btif/include/btif_common.h @@ -32,6 +32,7 @@ #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /******************************************************************************* * Constants & Macros diff --git a/system/btif/include/btif_config.h b/system/btif/include/btif_config.h index 0c5a244eea..c07dd3a062 100644 --- a/system/btif/include/btif_config.h +++ b/system/btif/include/btif_config.h @@ -24,8 +24,10 @@ #include <list> #include <string> #include <vector> + #include "osi/include/config.h" #include "types/ble_address_with_type.h" +#include "types/raw_address.h" static const char BTIF_CONFIG_MODULE[] = "btif_config_module"; diff --git a/system/btif/include/btif_debug_conn.h b/system/btif/include/btif_debug_conn.h index 19703ddc65..29b3335726 100644 --- a/system/btif/include/btif_debug_conn.h +++ b/system/btif/include/btif_debug_conn.h @@ -21,6 +21,7 @@ #include <hardware/bluetooth.h> #include "gatt_api.h" +#include "types/raw_address.h" typedef enum { BTIF_DEBUG_CONNECTED = 1, diff --git a/system/btif/include/btif_dm.h b/system/btif/include/btif_dm.h index 13af02673c..dbf047670c 100644 --- a/system/btif/include/btif_dm.h +++ b/system/btif/include/btif_dm.h @@ -22,6 +22,7 @@ #include "bta/include/bta_api.h" #include "bte_appl.h" #include "btif_uid.h" +#include "types/raw_address.h" /******************************************************************************* * Functions diff --git a/system/btif/include/btif_gatt_util.h b/system/btif/include/btif_gatt_util.h index e53bc260bc..a9e8c09a72 100644 --- a/system/btif/include/btif_gatt_util.h +++ b/system/btif/include/btif_gatt_util.h @@ -24,6 +24,7 @@ #include "bta/include/bta_gatt_api.h" #include "types/bt_transport.h" +#include "types/raw_address.h" void btif_to_bta_response(tGATTS_RSP* p_dest, btgatt_response_t* p_src); diff --git a/system/btif/include/btif_hd.h b/system/btif/include/btif_hd.h index 10efbb719c..b4ebdcf087 100644 --- a/system/btif/include/btif_hd.h +++ b/system/btif/include/btif_hd.h @@ -23,7 +23,9 @@ #include <hardware/bluetooth.h> #include <hardware/bt_hd.h> #include <stdint.h> + #include "bta/include/bta_hd_api.h" +#include "types/raw_address.h" typedef enum { BTIF_HD_DISABLED = 0, diff --git a/system/btif/include/btif_hh.h b/system/btif/include/btif_hh.h index 3ff3649089..813c3a5a4c 100644 --- a/system/btif/include/btif_hh.h +++ b/system/btif/include/btif_hh.h @@ -27,6 +27,7 @@ #include "bta/include/bta_hh_api.h" #include "osi/include/alarm.h" #include "osi/include/fixed_queue.h" +#include "types/raw_address.h" /******************************************************************************* * Constants & Macros diff --git a/system/btif/include/btif_pan_internal.h b/system/btif/include/btif_pan_internal.h index 50929beefb..ca52ce7f91 100644 --- a/system/btif/include/btif_pan_internal.h +++ b/system/btif/include/btif_pan_internal.h @@ -28,6 +28,7 @@ #define BTIF_PAN_INTERNAL_H #include "btif_pan.h" +#include "types/raw_address.h" /******************************************************************************* * Constants & Macros diff --git a/system/btif/include/btif_profile_queue.h b/system/btif/include/btif_profile_queue.h index da4e99290d..73c1978743 100644 --- a/system/btif/include/btif_profile_queue.h +++ b/system/btif/include/btif_profile_queue.h @@ -29,6 +29,8 @@ #include <hardware/bluetooth.h> +#include "types/raw_address.h" + typedef bt_status_t (*btif_connect_cb_t)(RawAddress* bda, uint16_t uuid); bt_status_t btif_queue_connect(uint16_t uuid, const RawAddress* bda, diff --git a/system/btif/include/btif_rc.h b/system/btif/include/btif_rc.h index cd2d0cc2f6..2840fa48aa 100644 --- a/system/btif/include/btif_rc.h +++ b/system/btif/include/btif_rc.h @@ -18,6 +18,7 @@ #define BTIF_RC_H #include "bta_av_api.h" +#include "types/raw_address.h" class RawAddress; diff --git a/system/btif/include/btif_sock_l2cap.h b/system/btif/include/btif_sock_l2cap.h index 0c867c5c45..5aadeb8129 100644 --- a/system/btif/include/btif_sock_l2cap.h +++ b/system/btif/include/btif_sock_l2cap.h @@ -5,10 +5,11 @@ #ifndef BTIF_SOCK_L2CAP_H #define BTIF_SOCK_L2CAP_H -#include "btif_uid.h" - #include <hardware/bluetooth.h> +#include "btif_uid.h" +#include "types/raw_address.h" + bt_status_t btsock_l2cap_init(int handle, uid_set_t* set); bt_status_t btsock_l2cap_cleanup(); bt_status_t btsock_l2cap_listen(const char* name, int channel, int* sock_fd, diff --git a/system/btif/include/btif_sock_rfc.h b/system/btif/include/btif_sock_rfc.h index a37447ed2e..b0f9133c4c 100644 --- a/system/btif/include/btif_sock_rfc.h +++ b/system/btif/include/btif_sock_rfc.h @@ -28,7 +28,7 @@ #define BTIF_SOCK_RFC_H #include "btif_uid.h" - +#include "types/raw_address.h" bt_status_t btsock_rfc_init(int handle, uid_set_t* set); bt_status_t btsock_rfc_cleanup(); bt_status_t btsock_rfc_listen(const char* name, const bluetooth::Uuid* uuid, diff --git a/system/btif/include/btif_sock_sco.h b/system/btif/include/btif_sock_sco.h index 9d1d8056ca..1b72a6a57c 100644 --- a/system/btif/include/btif_sock_sco.h +++ b/system/btif/include/btif_sock_sco.h @@ -20,6 +20,8 @@ #include <hardware/bluetooth.h> +#include "types/raw_address.h" + typedef struct thread_t thread_t; bt_status_t btsock_sco_init(thread_t* thread); diff --git a/system/btif/include/btif_storage.h b/system/btif/include/btif_storage.h index f52f5717c9..f048dc8696 100644 --- a/system/btif/include/btif_storage.h +++ b/system/btif/include/btif_storage.h @@ -24,6 +24,7 @@ #include "bt_target.h" #include "types/ble_address_with_type.h" +#include "types/raw_address.h" /******************************************************************************* * Constants & Macros diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc index 1149f7b7e0..5070bbc230 100644 --- a/system/btif/src/bluetooth.cc +++ b/system/btif/src/bluetooth.cc @@ -83,6 +83,7 @@ #include "stack/include/avdt_api.h" #include "stack/include/btm_api.h" #include "stack/include/btu.h" +#include "types/raw_address.h" using bluetooth::csis::CsisClientInterface; using bluetooth::hearing_aid::HearingAidInterface; diff --git a/system/btif/src/btif_a2dp.cc b/system/btif/src/btif_a2dp.cc index bd20e8020b..c9e76f7393 100644 --- a/system/btif/src/btif_a2dp.cc +++ b/system/btif/src/btif_a2dp.cc @@ -19,12 +19,13 @@ #define LOG_TAG "bt_btif_a2dp" +#include "btif_a2dp.h" + #include <stdbool.h> #include "audio_a2dp_hw/include/audio_a2dp_hw.h" #include "audio_hal_interface/a2dp_encoding.h" #include "bta_av_api.h" -#include "btif_a2dp.h" #include "btif_a2dp_control.h" #include "btif_a2dp_sink.h" #include "btif_a2dp_source.h" @@ -33,6 +34,7 @@ #include "btif_hf.h" #include "btif_util.h" #include "osi/include/log.h" +#include "types/raw_address.h" void btif_a2dp_on_idle(void) { LOG_VERBOSE("Peer stream endpoint type:%s", diff --git a/system/btif/src/btif_a2dp_control.cc b/system/btif/src/btif_a2dp_control.cc index 2be080e914..a3cbae42c4 100644 --- a/system/btif/src/btif_a2dp_control.cc +++ b/system/btif/src/btif_a2dp_control.cc @@ -19,19 +19,21 @@ #define LOG_TAG "bt_btif_a2dp_control" +#include "btif_a2dp_control.h" + #include <base/logging.h> #include <stdbool.h> #include <stdint.h> #include "audio_a2dp_hw/include/audio_a2dp_hw.h" #include "btif_a2dp.h" -#include "btif_a2dp_control.h" #include "btif_a2dp_sink.h" #include "btif_a2dp_source.h" #include "btif_av.h" #include "btif_av_co.h" #include "btif_hf.h" #include "osi/include/osi.h" +#include "types/raw_address.h" #include "uipc.h" #define A2DP_DATA_READ_POLL_MS 10 diff --git a/system/btif/src/btif_a2dp_sink.cc b/system/btif/src/btif_a2dp_sink.cc index aedef04724..68bea1a289 100644 --- a/system/btif/src/btif_a2dp_sink.cc +++ b/system/btif/src/btif_a2dp_sink.cc @@ -40,6 +40,7 @@ #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/bt_hdr.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" using bluetooth::common::MessageLoopThread; using LockGuard = std::lock_guard<std::mutex>; diff --git a/system/btif/src/btif_a2dp_source.cc b/system/btif/src/btif_a2dp_source.cc index 110b6715e1..da877859b2 100644 --- a/system/btif/src/btif_a2dp_source.cc +++ b/system/btif/src/btif_a2dp_source.cc @@ -52,6 +52,7 @@ #include "stack/include/acl_api.h" #include "stack/include/acl_api_types.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #include "uipc.h" using bluetooth::common::A2dpSessionMetrics; diff --git a/system/btif/src/btif_ble_scanner.cc b/system/btif/src/btif_ble_scanner.cc index 240cb5e45d..8400a4d6e8 100644 --- a/system/btif/src/btif_ble_scanner.cc +++ b/system/btif/src/btif_ble_scanner.cc @@ -22,29 +22,29 @@ #include <base/threading/thread.h> #include <errno.h> #include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unordered_set> -#include "device/include/controller.h" - -#include "btif_common.h" -#include "btif_util.h" -#include "main/shim/le_scanning_manager.h" -#include "main/shim/shim.h" -#include <hardware/bt_gatt.h> +#include <unordered_set> #include "advertise_data_parser.h" #include "bta_api.h" #include "bta_gatt_api.h" +#include "btif_common.h" #include "btif_config.h" #include "btif_dm.h" #include "btif_gatt.h" #include "btif_gatt_util.h" #include "btif_storage.h" +#include "btif_util.h" +#include "device/include/controller.h" +#include "main/shim/le_scanning_manager.h" +#include "main/shim/shim.h" #include "osi/include/log.h" #include "stack/include/btu.h" +#include "types/raw_address.h" #include "vendor_api.h" using base::Bind; diff --git a/system/btif/src/btif_config_cache.cc b/system/btif/src/btif_config_cache.cc index dc4ae4d96e..48df3f84f1 100644 --- a/system/btif/src/btif_config_cache.cc +++ b/system/btif/src/btif_config_cache.cc @@ -14,9 +14,11 @@ * limitations under the License. */ +#include "btif_config_cache.h" + #include <limits> -#include "btif_config_cache.h" +#include "types/raw_address.h" namespace { diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc index 1b5aaa7ff8..d151fd1515 100644 --- a/system/btif/src/btif_core.cc +++ b/system/btif/src/btif_core.cc @@ -56,6 +56,7 @@ #include "stack/include/btm_api.h" #include "stack/include/btm_ble_api.h" #include "types/bluetooth/uuid.h" +#include "types/raw_address.h" using base::PlatformThread; using bluetooth::Uuid; diff --git a/system/btif/src/btif_debug_conn.cc b/system/btif/src/btif_debug_conn.cc index dc36c451db..50ff386baa 100644 --- a/system/btif/src/btif_debug_conn.cc +++ b/system/btif/src/btif_debug_conn.cc @@ -16,12 +16,14 @@ * ******************************************************************************/ +#include "btif/include/btif_debug_conn.h" + #include <stdio.h> #include <string.h> #include <time.h> -#include "btif/include/btif_debug_conn.h" #include "common/time_util.h" +#include "types/raw_address.h" #define NUM_CONNECTION_EVENTS 16 #define TEMP_BUFFER_SIZE 30 diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index 0608291f35..f8d55a57a1 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -31,6 +31,10 @@ #include <base/bind.h> #include <base/logging.h> +#include <bluetooth/uuid.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_csis.h> +#include <hardware/bt_hearing_aid.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> @@ -41,11 +45,6 @@ #include <mutex> -#include <bluetooth/uuid.h> -#include <hardware/bluetooth.h> -#include <hardware/bt_csis.h> -#include <hardware/bt_hearing_aid.h> - #include "advertise_data_parser.h" #include "bta_csis_api.h" #include "bta_dm_int.h" @@ -76,6 +75,7 @@ #include "stack/btm/btm_dev.h" #include "stack/btm/btm_sec.h" #include "stack_config.h" +#include "types/raw_address.h" using bluetooth::Uuid; /****************************************************************************** diff --git a/system/btif/src/btif_gatt_client.cc b/system/btif/src/btif_gatt_client.cc index dfe88879ab..6e168f70cb 100644 --- a/system/btif/src/btif_gatt_client.cc +++ b/system/btif/src/btif_gatt_client.cc @@ -51,6 +51,7 @@ #include "stack/include/acl_api_types.h" #include "stack/include/btu.h" #include "types/bt_transport.h" +#include "types/raw_address.h" #include "vendor_api.h" using base::Bind; diff --git a/system/btif/src/btif_gatt_server.cc b/system/btif/src/btif_gatt_server.cc index bd8103bb28..75a160198a 100644 --- a/system/btif/src/btif_gatt_server.cc +++ b/system/btif/src/btif_gatt_server.cc @@ -28,27 +28,26 @@ #include <base/bind.h> #include <errno.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <hardware/bluetooth.h> -#include <hardware/bt_gatt.h> - -#include "btif_common.h" -#include "btif_util.h" - #include "bta_api.h" #include "bta_gatt_api.h" +#include "btif_common.h" #include "btif_config.h" #include "btif_dm.h" #include "btif_gatt.h" #include "btif_gatt_util.h" #include "btif_storage.h" +#include "btif_util.h" #include "osi/include/allocator.h" #include "osi/include/log.h" #include "stack/include/btu.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using base::Bind; using base::Owned; diff --git a/system/btif/src/btif_gatt_test.cc b/system/btif/src/btif_gatt_test.cc index 02216c7bb9..cb03d2822d 100644 --- a/system/btif/src/btif_gatt_test.cc +++ b/system/btif/src/btif_gatt_test.cc @@ -18,26 +18,26 @@ #define LOG_TAG "bt_btif_gatt" +#include "btif_gatt.h" + #include <errno.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <hardware/bluetooth.h> -#include <hardware/bt_gatt.h> - -#include "btif_common.h" -#include "btif_util.h" - #include "bta_gatt_api.h" #include "bte_appl.h" +#include "btif_common.h" #include "btif_dm.h" -#include "btif_gatt.h" #include "btif_gatt_util.h" #include "btif_storage.h" +#include "btif_util.h" #include "gatt_api.h" #include "osi/include/log.h" #include "osi/include/osi.h" +#include "types/raw_address.h" using bluetooth::Uuid; /******************************************************************************* diff --git a/system/btif/src/btif_gatt_util.cc b/system/btif/src/btif_gatt_util.cc index 2091650079..cf4278b933 100644 --- a/system/btif/src/btif_gatt_util.cc +++ b/system/btif/src/btif_gatt_util.cc @@ -21,13 +21,12 @@ #include "btif_gatt_util.h" #include <errno.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <hardware/bluetooth.h> -#include <hardware/bt_gatt.h> - #include "bta_api.h" #include "bta_gatt_api.h" #include "bta_jv_api.h" @@ -41,6 +40,7 @@ #include "osi/include/osi.h" #include "stack/btm/btm_sec.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btif/src/btif_hearing_aid.cc b/system/btif/src/btif_hearing_aid.cc index 18d9f671a0..3b51ede1b3 100644 --- a/system/btif/src/btif_hearing_aid.cc +++ b/system/btif/src/btif_hearing_aid.cc @@ -18,17 +18,18 @@ /* Hearing Aid Profile Interface */ -#include "bta_hearing_aid_api.h" -#include "btif_common.h" -#include "btif_storage.h" -#include "stack/include/btu.h" - #include <base/bind.h> #include <base/location.h> #include <base/logging.h> #include <hardware/bluetooth.h> #include <hardware/bt_hearing_aid.h> +#include "bta_hearing_aid_api.h" +#include "btif_common.h" +#include "btif_storage.h" +#include "stack/include/btu.h" +#include "types/raw_address.h" + using base::Bind; using base::Unretained; using bluetooth::hearing_aid::ConnectionState; diff --git a/system/btif/src/btif_hf_client.cc b/system/btif/src/btif_hf_client.cc index f3b7fcdbf4..b71060f3bb 100644 --- a/system/btif/src/btif_hf_client.cc +++ b/system/btif/src/btif_hf_client.cc @@ -46,10 +46,9 @@ #define LOG_TAG "bt_btif_hfc" #endif -#include <string.h> - #include <hardware/bluetooth.h> #include <hardware/bt_hf_client.h> +#include <string.h> #include "bta_hf_client_api.h" #include "btif_common.h" @@ -57,6 +56,7 @@ #include "btif_util.h" #include "osi/include/osi.h" #include "osi/include/properties.h" +#include "types/raw_address.h" /******************************************************************************* * Constants & Macros diff --git a/system/btif/src/btif_hh.cc b/system/btif/src/btif_hh.cc index 2fd333b618..246c2dee88 100644 --- a/system/btif/src/btif_hh.cc +++ b/system/btif/src/btif_hh.cc @@ -41,6 +41,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/hidh_api.h" #include "stack/include/l2c_api.h" +#include "types/raw_address.h" #define COD_HID_KEYBOARD 0x0540 #define COD_HID_POINTING 0x0580 diff --git a/system/btif/src/btif_le_audio.cc b/system/btif/src/btif_le_audio.cc index 94fa9d74f4..8ee1422e02 100644 --- a/system/btif/src/btif_le_audio.cc +++ b/system/btif/src/btif_le_audio.cc @@ -16,13 +16,14 @@ */ #include <hardware/bluetooth.h> +#include <hardware/bt_le_audio.h> + #include <vector> #include "btif_common.h" #include "btif_storage.h" #include "hardware/bt_le_audio.h" - -#include <hardware/bt_le_audio.h> +#include "types/raw_address.h" using base::Bind; using base::Unretained; diff --git a/system/btif/src/btif_pan.cc b/system/btif/src/btif_pan.cc index 9870e849f9..1a956ca80f 100644 --- a/system/btif/src/btif_pan.cc +++ b/system/btif/src/btif_pan.cc @@ -52,6 +52,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/btu.h" // do_in_main_thread #include "stack/include/pan_api.h" +#include "types/raw_address.h" #define FORWARD_IGNORE 1 #define FORWARD_SUCCESS 0 diff --git a/system/btif/src/btif_profile_queue.cc b/system/btif/src/btif_profile_queue.cc index ec473f4bbf..b557cab8a3 100644 --- a/system/btif/src/btif_profile_queue.cc +++ b/system/btif/src/btif_profile_queue.cc @@ -33,11 +33,13 @@ #include <base/logging.h> #include <base/strings/stringprintf.h> #include <string.h> + #include <list> #include "btif/include/stack_manager.h" #include "btif_common.h" #include "main/shim/dumpsys.h" +#include "types/raw_address.h" /******************************************************************************* * Local type definitions diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc index c8d33ddd18..dedbde4c8a 100644 --- a/system/btif/src/btif_rc.cc +++ b/system/btif/src/btif_rc.cc @@ -52,6 +52,7 @@ #include "osi/include/properties.h" #include "stack/include/avrc_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #define RC_INVALID_TRACK_ID (0xFFFFFFFFFFFFFFFFULL) diff --git a/system/btif/src/btif_sdp.cc b/system/btif/src/btif_sdp.cc index d7c3f67b3b..031b230bcc 100644 --- a/system/btif/src/btif_sdp.cc +++ b/system/btif/src/btif_sdp.cc @@ -28,17 +28,17 @@ #define LOG_TAG "bt_btif_sdp" -#include <stdlib.h> -#include <string.h> - #include <hardware/bluetooth.h> #include <hardware/bt_sdp.h> +#include <stdlib.h> +#include <string.h> #include "bta_api.h" #include "bta_sdp_api.h" #include "btif_common.h" #include "btif_profile_queue.h" #include "btif_util.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btif/src/btif_sock.cc b/system/btif/src/btif_sock.cc index e6a03f2da0..0e2803fa02 100644 --- a/system/btif/src/btif_sock.cc +++ b/system/btif/src/btif_sock.cc @@ -18,14 +18,13 @@ #define LOG_TAG "bt_btif_sock" -#include <atomic> - #include <base/logging.h> - #include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h> #include <hardware/bluetooth.h> #include <hardware/bt_sock.h> +#include <atomic> + #include "bta_api.h" #include "btif_common.h" #include "btif_config.h" @@ -39,6 +38,7 @@ #include "btif_util.h" #include "device/include/controller.h" #include "osi/include/thread.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc index 8f07ec3ec3..4cd5b40b6e 100644 --- a/system/btif/src/btif_storage.cc +++ b/system/btif/src/btif_storage.cc @@ -56,6 +56,7 @@ #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/btu.h" +#include "types/raw_address.h" using base::Bind; using bluetooth::Uuid; diff --git a/system/btif/src/btif_vc.cc b/system/btif/src/btif_vc.cc index bf51eb5913..66374e215e 100644 --- a/system/btif/src/btif_vc.cc +++ b/system/btif/src/btif_vc.cc @@ -17,16 +17,16 @@ /* Volume Control Interface */ -#include <hardware/bluetooth.h> -#include <hardware/bt_vc.h> - #include <base/bind.h> #include <base/location.h> #include <base/logging.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_vc.h> #include "bta_vc_api.h" #include "btif_common.h" #include "stack/include/btu.h" +#include "types/raw_address.h" using base::Bind; using base::Unretained; diff --git a/system/btif/test/btif_core_test.cc b/system/btif/test/btif_core_test.cc index 0f197f0769..8f83351614 100644 --- a/system/btif/test/btif_core_test.cc +++ b/system/btif/test/btif_core_test.cc @@ -15,12 +15,14 @@ */ #include <gtest/gtest.h> + #include <future> #include <map> #include "bta/include/bta_ag_api.h" #include "btif/include/btif_api.h" #include "btif/include/btif_common.h" +#include "types/raw_address.h" void set_hal_cbacks(bt_callbacks_t* callbacks); diff --git a/system/common/address_obfuscator.cc b/system/common/address_obfuscator.cc index 5c30288fcb..1803520a4d 100644 --- a/system/common/address_obfuscator.cc +++ b/system/common/address_obfuscator.cc @@ -18,12 +18,13 @@ #include "address_obfuscator.h" -#include <algorithm> - #include <base/logging.h> #include <openssl/hmac.h> +#include <algorithm> + #include "bt_trace.h" +#include "types/raw_address.h" namespace bluetooth { namespace common { @@ -56,4 +57,4 @@ std::string AddressObfuscator::Obfuscate(const RawAddress& address) { } } // namespace common -} // namespace bluetooth
\ No newline at end of file +} // namespace bluetooth diff --git a/system/common/address_obfuscator_unittest.cc b/system/common/address_obfuscator_unittest.cc index d10446f3d8..62157deb69 100644 --- a/system/common/address_obfuscator_unittest.cc +++ b/system/common/address_obfuscator_unittest.cc @@ -20,6 +20,8 @@ #include <gtest/gtest.h> +#include "types/raw_address.h" + using bluetooth::common::AddressObfuscator; constexpr AddressObfuscator::Octet32 kEmptyKey = {0}; @@ -117,4 +119,4 @@ TEST(AddressObfuscatorTest, test_obfuscate_address_key2_max_address) { AddressObfuscator::GetInstance()->Obfuscate(kTestData2_3); EXPECT_EQ(result.size(), AddressObfuscator::kOctet32Length); EXPECT_EQ(result, kTestResult2_3); -}
\ No newline at end of file +} diff --git a/system/common/metric_id_allocator.cc b/system/common/metric_id_allocator.cc index 49b11cce5c..09b9a2647f 100644 --- a/system/common/metric_id_allocator.cc +++ b/system/common/metric_id_allocator.cc @@ -16,12 +16,15 @@ * ******************************************************************************/ +#include "metric_id_allocator.h" + #include <base/logging.h> + #include <functional> #include <mutex> #include <thread> -#include "metric_id_allocator.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/common/metric_id_allocator_unittest.cc b/system/common/metric_id_allocator_unittest.cc index ccc1576475..4104802f2e 100644 --- a/system/common/metric_id_allocator_unittest.cc +++ b/system/common/metric_id_allocator_unittest.cc @@ -16,12 +16,15 @@ * ******************************************************************************/ +#include "common/metric_id_allocator.h" + #include <base/logging.h> #include <gmock/gmock.h> #include <gtest/gtest.h> + #include <thread> -#include "common/metric_id_allocator.h" +#include "types/raw_address.h" namespace testing { diff --git a/system/common/metrics.cc b/system/common/metrics.cc index 9214dcbded..0aa440a1dd 100644 --- a/system/common/metrics.cc +++ b/system/common/metrics.cc @@ -16,7 +16,14 @@ * ******************************************************************************/ +#include "metrics.h" + +#include <base/base64.h> +#include <base/logging.h> +#include <include/hardware/bt_av.h> +#include <statslog.h> #include <unistd.h> + #include <algorithm> #include <array> #include <cerrno> @@ -26,20 +33,14 @@ #include <memory> #include <mutex> -#include <base/base64.h> -#include <base/logging.h> -#include <include/hardware/bt_av.h> -#include <statslog.h> - -#include "bluetooth/metrics/bluetooth.pb.h" -#include "osi/include/osi.h" -#include "stack/include/btm_api_types.h" - #include "address_obfuscator.h" +#include "bluetooth/metrics/bluetooth.pb.h" #include "leaky_bonded_queue.h" #include "metric_id_allocator.h" -#include "metrics.h" +#include "osi/include/osi.h" +#include "stack/include/btm_api_types.h" #include "time_util.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/common/metrics.h b/system/common/metrics.h index c8973f323a..c224734b07 100644 --- a/system/common/metrics.h +++ b/system/common/metrics.h @@ -22,9 +22,12 @@ #include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h> #include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h> #include <stdint.h> + #include <memory> #include <string> +#include "types/raw_address.h" + namespace bluetooth { namespace common { diff --git a/system/common/metrics_linux.cc b/system/common/metrics_linux.cc index 68242bf5fd..46cab49f2a 100644 --- a/system/common/metrics_linux.cc +++ b/system/common/metrics_linux.cc @@ -16,11 +16,11 @@ * ******************************************************************************/ -#include "metrics.h" - #include <base/logging.h> #include "leaky_bonded_queue.h" +#include "metrics.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc index ea3f5e05d0..7dfcd3ee0d 100644 --- a/system/device/src/interop.cc +++ b/system/device/src/interop.cc @@ -18,16 +18,18 @@ #define LOG_TAG "bt_device_interop" +#include "device/include/interop.h" + #include <base/logging.h> #include <string.h> // For memcmp #include "btcore/include/module.h" #include "check.h" -#include "device/include/interop.h" #include "device/include/interop_database.h" #include "osi/include/allocator.h" #include "osi/include/list.h" #include "osi/include/log.h" +#include "types/raw_address.h" #define CASE_RETURN_STR(const) \ case const: \ diff --git a/system/device/test/interop_test.cc b/system/device/test/interop_test.cc index 71cc8cb504..2e1598ee3d 100644 --- a/system/device/test/interop_test.cc +++ b/system/device/test/interop_test.cc @@ -16,9 +16,11 @@ * ******************************************************************************/ +#include "device/include/interop.h" + #include <gtest/gtest.h> -#include "device/include/interop.h" +#include "types/raw_address.h" TEST(InteropTest, test_lookup_hit) { RawAddress test_address; diff --git a/system/gd/rust/topshim/btav/btav_shim.cc b/system/gd/rust/topshim/btav/btav_shim.cc index 35bfa6fa70..db93f20b13 100644 --- a/system/gd/rust/topshim/btav/btav_shim.cc +++ b/system/gd/rust/topshim/btav/btav_shim.cc @@ -14,17 +14,18 @@ * limitations under the License. */ +#include "gd/rust/topshim/btav/btav_shim.h" + #include <cstdio> #include <memory> -#include "gd/rust/topshim/btav/btav_shim.h" +#include "base/callback.h" #include "include/hardware/avrcp/avrcp.h" #include "include/hardware/bluetooth.h" - -#include "base/callback.h" #include "rust/cxx.h" #include "src/profiles/a2dp.rs.h" #include "src/profiles/avrcp.rs.h" +#include "types/raw_address.h" namespace rusty = ::bluetooth::topshim::rust; diff --git a/system/gd/rust/topshim/btav/btav_shim.h b/system/gd/rust/topshim/btav/btav_shim.h index 7592c590c6..1cabd9c15f 100644 --- a/system/gd/rust/topshim/btav/btav_shim.h +++ b/system/gd/rust/topshim/btav/btav_shim.h @@ -21,8 +21,8 @@ #include "audio_hal_interface/a2dp_encoding_host.h" #include "include/hardware/avrcp/avrcp.h" #include "include/hardware/bt_av.h" - #include "rust/cxx.h" +#include "types/raw_address.h" namespace bluetooth { namespace topshim { diff --git a/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc b/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc index 4dcde63862..f0816df71e 100644 --- a/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc +++ b/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc @@ -14,10 +14,12 @@ * limitations under the License. */ +#include "gd/rust/topshim/btav_sink/btav_sink_shim.h" + #include <memory> -#include "gd/rust/topshim/btav_sink/btav_sink_shim.h" #include "include/hardware/bluetooth.h" +#include "types/raw_address.h" namespace bluetooth { namespace topshim { diff --git a/system/gd/rust/topshim/gatt/gatt_shim.cc b/system/gd/rust/topshim/gatt/gatt_shim.cc index a84a523b63..b587b60c9d 100644 --- a/system/gd/rust/topshim/gatt/gatt_shim.cc +++ b/system/gd/rust/topshim/gatt/gatt_shim.cc @@ -20,6 +20,7 @@ #include "base/callback.h" #include "rust/cxx.h" #include "src/profiles/gatt.rs.h" +#include "types/raw_address.h" namespace bluetooth { namespace topshim { diff --git a/system/hci/src/hci_packet_parser.cc b/system/hci/src/hci_packet_parser.cc index b92af81959..2ee75fc57c 100644 --- a/system/hci/src/hci_packet_parser.cc +++ b/system/hci/src/hci_packet_parser.cc @@ -28,6 +28,7 @@ #include "osi/include/log.h" #include "stack/include/bt_hdr.h" #include "stack/include/hcidefs.h" +#include "types/raw_address.h" static const command_opcode_t NO_OPCODE_CHECKING = 0; diff --git a/system/include/hardware/ble_advertiser.h b/system/include/hardware/ble_advertiser.h index 72731b221c..34e4a52160 100644 --- a/system/include/hardware/ble_advertiser.h +++ b/system/include/hardware/ble_advertiser.h @@ -18,8 +18,11 @@ #define ANDROID_INCLUDE_BLE_ADVERTISER_H #include <base/callback_forward.h> +#include <raw_address.h> #include <stdint.h> + #include <vector> + #include "bt_common_types.h" #include "bt_gatt_types.h" diff --git a/system/include/hardware/ble_scanner.h b/system/include/hardware/ble_scanner.h index 5d6e9459fe..67e805b5dc 100644 --- a/system/include/hardware/ble_scanner.h +++ b/system/include/hardware/ble_scanner.h @@ -18,9 +18,12 @@ #define ANDROID_INCLUDE_BLE_SCANNER_H #include <bluetooth/uuid.h> +#include <raw_address.h> #include <stdint.h> + #include <memory> #include <vector> + #include "bt_common_types.h" #include "bt_gatt_client.h" #include "bt_gatt_types.h" diff --git a/system/include/hardware/bluetooth_headset_callbacks.h b/system/include/hardware/bluetooth_headset_callbacks.h index e115a150d8..ec9731b959 100644 --- a/system/include/hardware/bluetooth_headset_callbacks.h +++ b/system/include/hardware/bluetooth_headset_callbacks.h @@ -16,6 +16,8 @@ #pragma once +#include <raw_address.h> + #include "bt_hf.h" namespace bluetooth { @@ -197,4 +199,4 @@ class Callbacks { }; } // namespace headset -} // namespace bluetooth
\ No newline at end of file +} // namespace bluetooth diff --git a/system/include/hardware/bluetooth_headset_interface.h b/system/include/hardware/bluetooth_headset_interface.h index a1e78d2ad6..362979a5aa 100644 --- a/system/include/hardware/bluetooth_headset_interface.h +++ b/system/include/hardware/bluetooth_headset_interface.h @@ -16,6 +16,8 @@ #pragma once +#include <raw_address.h> + #include "bluetooth_headset_callbacks.h" #include "bt_hf.h" diff --git a/system/include/hardware/bt_av.h b/system/include/hardware/bt_av.h index b3be7a2340..8a7234b9df 100644 --- a/system/include/hardware/bt_av.h +++ b/system/include/hardware/bt_av.h @@ -17,9 +17,10 @@ #ifndef ANDROID_INCLUDE_BT_AV_H #define ANDROID_INCLUDE_BT_AV_H -#include <vector> - #include <hardware/bluetooth.h> +#include <raw_address.h> + +#include <vector> __BEGIN_DECLS diff --git a/system/include/hardware/bt_common_types.h b/system/include/hardware/bt_common_types.h index ee607e40fd..9d9a454825 100644 --- a/system/include/hardware/bt_common_types.h +++ b/system/include/hardware/bt_common_types.h @@ -23,11 +23,13 @@ #ifndef ANDROID_INCLUDE_BT_COMMON_TYPES_H #define ANDROID_INCLUDE_BT_COMMON_TYPES_H -#include "bluetooth.h" - #include <bluetooth/uuid.h> +#include <raw_address.h> + #include <vector> +#include "bluetooth.h" + typedef struct { uint8_t client_if; uint8_t filt_index; diff --git a/system/include/hardware/bt_gatt_client.h b/system/include/hardware/bt_gatt_client.h index 6b1f86d275..1dc5e91e39 100644 --- a/system/include/hardware/bt_gatt_client.h +++ b/system/include/hardware/bt_gatt_client.h @@ -17,12 +17,13 @@ #ifndef ANDROID_INCLUDE_BT_GATT_CLIENT_H #define ANDROID_INCLUDE_BT_GATT_CLIENT_H +#include <bluetooth/uuid.h> +#include <raw_address.h> #include <stdint.h> + #include "bt_common_types.h" #include "bt_gatt_types.h" -#include <bluetooth/uuid.h> - __BEGIN_DECLS /** diff --git a/system/include/hardware/bt_gatt_server.h b/system/include/hardware/bt_gatt_server.h index e5ed7559a7..0e9b03942b 100644 --- a/system/include/hardware/bt_gatt_server.h +++ b/system/include/hardware/bt_gatt_server.h @@ -17,6 +17,7 @@ #ifndef ANDROID_INCLUDE_BT_GATT_SERVER_H #define ANDROID_INCLUDE_BT_GATT_SERVER_H +#include <raw_address.h> #include <stdint.h> #include "bt_gatt_types.h" diff --git a/system/include/hardware/bt_hd.h b/system/include/hardware/bt_hd.h index be93709dcc..0566e89455 100644 --- a/system/include/hardware/bt_hd.h +++ b/system/include/hardware/bt_hd.h @@ -17,6 +17,7 @@ #ifndef ANDROID_INCLUDE_BT_HD_H #define ANDROID_INCLUDE_BT_HD_H +#include <raw_address.h> #include <stdint.h> __BEGIN_DECLS diff --git a/system/include/hardware/bt_hearing_aid.h b/system/include/hardware/bt_hearing_aid.h index 1bfb42270d..09e880d7c5 100644 --- a/system/include/hardware/bt_hearing_aid.h +++ b/system/include/hardware/bt_hearing_aid.h @@ -18,6 +18,7 @@ #define ANDROID_INCLUDE_BT_HEARING_AID_H #include <hardware/bluetooth.h> +#include <raw_address.h> namespace bluetooth { namespace hearing_aid { diff --git a/system/include/hardware/bt_hf_client.h b/system/include/hardware/bt_hf_client.h index 0484121533..7263805340 100644 --- a/system/include/hardware/bt_hf_client.h +++ b/system/include/hardware/bt_hf_client.h @@ -16,6 +16,7 @@ #ifndef ANDROID_INCLUDE_BT_HF_CLIENT_H #define ANDROID_INCLUDE_BT_HF_CLIENT_H +#include <raw_address.h> __BEGIN_DECLS diff --git a/system/include/hardware/bt_hh.h b/system/include/hardware/bt_hh.h index 06272d2c97..6355eca26f 100644 --- a/system/include/hardware/bt_hh.h +++ b/system/include/hardware/bt_hh.h @@ -17,7 +17,9 @@ #ifndef ANDROID_INCLUDE_BT_HH_H #define ANDROID_INCLUDE_BT_HH_H +#include <raw_address.h> #include <stdint.h> + #include <string> __BEGIN_DECLS diff --git a/system/include/hardware/bt_pan.h b/system/include/hardware/bt_pan.h index 90caa5dce0..439edf8592 100644 --- a/system/include/hardware/bt_pan.h +++ b/system/include/hardware/bt_pan.h @@ -16,6 +16,7 @@ #ifndef ANDROID_INCLUDE_BT_PAN_H #define ANDROID_INCLUDE_BT_PAN_H +#include <raw_address.h> __BEGIN_DECLS diff --git a/system/include/hardware/bt_rc.h b/system/include/hardware/bt_rc.h index a4e349d293..dc3179a292 100755 --- a/system/include/hardware/bt_rc.h +++ b/system/include/hardware/bt_rc.h @@ -17,6 +17,7 @@ #ifndef ANDROID_INCLUDE_BT_RC_H #define ANDROID_INCLUDE_BT_RC_H +#include <raw_address.h> __BEGIN_DECLS /* Change this macro to use multiple RC */ diff --git a/system/include/hardware/bt_sdp.h b/system/include/hardware/bt_sdp.h index 93745bc2a2..bf4e74894e 100644 --- a/system/include/hardware/bt_sdp.h +++ b/system/include/hardware/bt_sdp.h @@ -16,6 +16,8 @@ #pragma once +#include <raw_address.h> + #include "bluetooth.h" #define SDP_OPP_SUPPORTED_FORMATS_MAX_LENGTH 15 diff --git a/system/include/hardware/bt_vc.h b/system/include/hardware/bt_vc.h index f1a63d3dca..fb0b725fac 100644 --- a/system/include/hardware/bt_vc.h +++ b/system/include/hardware/bt_vc.h @@ -18,6 +18,7 @@ #pragma once #include <hardware/bluetooth.h> +#include <raw_address.h> #include <variant> diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc index 4b5f53b7bb..424f99dcb8 100644 --- a/system/main/shim/acl.cc +++ b/system/main/shim/acl.cc @@ -60,6 +60,7 @@ #include "stack/include/btm_status.h" #include "stack/include/sec_hci_link_interface.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/main/shim/acl.h b/system/main/shim/acl.h index 984dc644da..da509422da 100644 --- a/system/main/shim/acl.h +++ b/system/main/shim/acl.h @@ -30,6 +30,7 @@ #include "main/shim/link_connection_interface.h" #include "main/shim/link_policy_interface.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" namespace bluetooth { namespace shim { diff --git a/system/main/shim/activity_attribution.cc b/system/main/shim/activity_attribution.cc index 5b51fa9632..625121b6b5 100644 --- a/system/main/shim/activity_attribution.cc +++ b/system/main/shim/activity_attribution.cc @@ -21,6 +21,7 @@ #include "gd/btaa/activity_attribution.h" #include "helpers.h" #include "main/shim/entry.h" +#include "types/raw_address.h" class ActivityAttributionInterfaceImpl : public ActivityAttributionInterface, diff --git a/system/main/shim/btm_api.h b/system/main/shim/btm_api.h index 0cb094a74e..a704d8c4a9 100644 --- a/system/main/shim/btm_api.h +++ b/system/main/shim/btm_api.h @@ -24,6 +24,7 @@ #include "stack/include/btm_api_types.h" #include "stack/include/btm_ble_api_types.h" #include "types/hci_role.h" +#include "types/raw_address.h" namespace bluetooth { namespace shim { diff --git a/system/main/shim/controller.cc b/system/main/shim/controller.cc index defa08a0cf..13313a80b6 100644 --- a/system/main/shim/controller.cc +++ b/system/main/shim/controller.cc @@ -17,16 +17,17 @@ #define LOG_TAG "bt_shim_controller" #include "main/shim/controller.h" + #include "btcore/include/module.h" #include "gd/common/init_flags.h" +#include "hci/controller.h" #include "main/shim/entry.h" #include "main/shim/shim.h" #include "main/shim/stack.h" #include "osi/include/future.h" #include "osi/include/log.h" - -#include "hci/controller.h" #include "src/bridge.rs.h" +#include "types/raw_address.h" using ::bluetooth::common::init_flags::gd_rust_is_enabled; using ::bluetooth::shim::GetController; diff --git a/system/main/shim/helpers.h b/system/main/shim/helpers.h index d213e5e8e9..b7e4bc73f1 100644 --- a/system/main/shim/helpers.h +++ b/system/main/shim/helpers.h @@ -26,6 +26,7 @@ #include "stack/include/hcidefs.h" #include "types/ble_address_with_type.h" #include "types/hci_role.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/main/shim/l2c_api.cc b/system/main/shim/l2c_api.cc index bab049b4b6..c4686d0743 100644 --- a/system/main/shim/l2c_api.cc +++ b/system/main/shim/l2c_api.cc @@ -42,6 +42,7 @@ #include "stack/include/btu.h" #include "stack/include/gatt_api.h" #include "stack/include/sco_hci_link_interface.h" +#include "types/raw_address.h" extern void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, uint16_t latency, uint16_t timeout, diff --git a/system/main/shim/l2c_api.h b/system/main/shim/l2c_api.h index 5e1b552ea0..a100cea862 100644 --- a/system/main/shim/l2c_api.h +++ b/system/main/shim/l2c_api.h @@ -23,6 +23,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/l2c_api.h" #include "types/hci_role.h" +#include "types/raw_address.h" namespace bluetooth { namespace shim { diff --git a/system/main/shim/le_advertising_manager.cc b/system/main/shim/le_advertising_manager.cc index 4430b64036..6c86a9e42f 100644 --- a/system/main/shim/le_advertising_manager.cc +++ b/system/main/shim/le_advertising_manager.cc @@ -22,6 +22,8 @@ #include <hardware/bt_gatt.h> #include <vector> + +#include "btif/include/btif_common.h" #include "gd/common/init_flags.h" #include "gd/hci/acl_manager.h" #include "gd/hci/controller.h" @@ -30,10 +32,9 @@ #include "gd/storage/storage_module.h" #include "main/shim/entry.h" #include "main/shim/helpers.h" - -#include "btif/include/btif_common.h" #include "stack/include/ble_advertiser.h" #include "stack/include/btm_api.h" +#include "types/raw_address.h" using bluetooth::hci::Address; using bluetooth::hci::AddressType; diff --git a/system/main/shim/le_scanning_manager.cc b/system/main/shim/le_scanning_manager.cc index 726aa8b2b8..43d3f86f56 100644 --- a/system/main/shim/le_scanning_manager.cc +++ b/system/main/shim/le_scanning_manager.cc @@ -22,8 +22,10 @@ #include <base/threading/thread.h> #include <hardware/bluetooth.h> #include <stdio.h> + #include <unordered_set> +#include "advertise_data_parser.h" #include "btif/include/btif_common.h" #include "gd/hci/address.h" #include "gd/hci/le_scanning_manager.h" @@ -33,9 +35,8 @@ #include "main/shim/entry.h" #include "main/shim/helpers.h" #include "main/shim/shim.h" - -#include "advertise_data_parser.h" #include "stack/btm/btm_int_types.h" +#include "types/raw_address.h" using bluetooth::ToRawAddress; using bluetooth::ToGdAddress; diff --git a/system/main/shim/link_policy.cc b/system/main/shim/link_policy.cc index 038620dab5..2d662f3562 100644 --- a/system/main/shim/link_policy.cc +++ b/system/main/shim/link_policy.cc @@ -14,9 +14,12 @@ * limitations under the License. */ +#include "main/shim/link_policy.h" + #include <base/bind.h> #include <base/location.h> #include <base/strings/stringprintf.h> + #include <cstdint> #include <memory> @@ -24,7 +27,6 @@ #include "hci/controller.h" #include "main/shim/controller.h" #include "main/shim/dumpsys.h" -#include "main/shim/link_policy.h" #include "main/shim/stack.h" #include "osi/include/log.h" #include "osi/include/osi.h" // UNUSED_ATTR @@ -33,6 +35,7 @@ #include "stack/include/btm_api_types.h" #include "stack/include/btm_ble_api_types.h" #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" bt_status_t do_in_main_thread(const base::Location& from_here, base::OnceClosure task); diff --git a/system/main/test/main_shim_test.cc b/system/main/test/main_shim_test.cc index d8059200f3..117c6e0446 100644 --- a/system/main/test/main_shim_test.cc +++ b/system/main/test/main_shim_test.cc @@ -53,6 +53,7 @@ #include "stack/l2cap/l2c_int.h" #include "test/common/main_handler.h" #include "test/mock/mock_main_shim_entry.h" +#include "types/raw_address.h" using namespace bluetooth; using namespace testing; diff --git a/system/profile/avrcp/avrcp_internal.h b/system/profile/avrcp/avrcp_internal.h index 7c847edf66..3bdc54a8b5 100644 --- a/system/profile/avrcp/avrcp_internal.h +++ b/system/profile/avrcp/avrcp_internal.h @@ -20,6 +20,7 @@ #include "stack/include/avrc_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" /** * Wrapper classes for the API functions currently defined in "packages/modules/Bluetooth/system/stack". diff --git a/system/profile/avrcp/connection_handler.cc b/system/profile/avrcp/connection_handler.cc index b288a718c3..680f1ac06c 100644 --- a/system/profile/avrcp/connection_handler.cc +++ b/system/profile/avrcp/connection_handler.cc @@ -30,6 +30,7 @@ #include "osi/include/allocator.h" #include "osi/include/properties.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { diff --git a/system/profile/avrcp/device.cc b/system/profile/avrcp/device.cc index ed1c705818..75a8c2bbbf 100644 --- a/system/profile/avrcp/device.cc +++ b/system/profile/avrcp/device.cc @@ -24,6 +24,7 @@ #include "packet/avrcp/set_absolute_volume.h" #include "packet/avrcp/set_addressed_player.h" #include "stack_config.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { diff --git a/system/profile/avrcp/tests/avrcp_connection_handler_test.cc b/system/profile/avrcp/tests/avrcp_connection_handler_test.cc index e2765fab77..e9f79c48e4 100644 --- a/system/profile/avrcp/tests/avrcp_connection_handler_test.cc +++ b/system/profile/avrcp/tests/avrcp_connection_handler_test.cc @@ -22,6 +22,7 @@ #include "avrcp_internal.h" #include "avrcp_test_helper.h" #include "connection_handler.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::DoAll; diff --git a/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc b/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc index 24a794dfb9..bc3dd6f19e 100644 --- a/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc +++ b/system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc @@ -5,6 +5,7 @@ #include "device.h" #include "packet_test_helper.h" #include "stack_config.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { @@ -83,4 +84,4 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) { const stack_config_t* stack_config_get_interface(void) { return &bluetooth::avrcp::interface; -}
\ No newline at end of file +} diff --git a/system/profile/avrcp/tests/avrcp_device_test.cc b/system/profile/avrcp/tests/avrcp_device_test.cc index 379ea04463..7aea88b241 100644 --- a/system/profile/avrcp/tests/avrcp_device_test.cc +++ b/system/profile/avrcp/tests/avrcp_device_test.cc @@ -14,21 +14,22 @@ * limitations under the License. */ -#include <algorithm> -#include <iostream> - #include <base/bind.h> #include <base/logging.h> #include <base/threading/thread.h> #include <gmock/gmock.h> #include <gtest/gtest.h> +#include <algorithm> +#include <iostream> + #include "avrcp_packet.h" #include "avrcp_test_helper.h" #include "device.h" #include "stack_config.h" #include "tests/avrcp/avrcp_test_packets.h" #include "tests/packet_test_helper.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { diff --git a/system/profile/avrcp/tests/avrcp_test_helper.h b/system/profile/avrcp/tests/avrcp_test_helper.h index b2dbed2a78..498a5cb117 100644 --- a/system/profile/avrcp/tests/avrcp_test_helper.h +++ b/system/profile/avrcp/tests/avrcp_test_helper.h @@ -25,6 +25,7 @@ #include "avrcp_packet.h" #include "stack/include/bt_hdr.h" #include "tests/packet_test_helper.h" +#include "types/raw_address.h" namespace bluetooth { namespace avrcp { diff --git a/system/service/a2dp_sink.cc b/system/service/a2dp_sink.cc index e23c588363..d7b3ec6585 100644 --- a/system/service/a2dp_sink.cc +++ b/system/service/a2dp_sink.cc @@ -20,6 +20,7 @@ #include <base/memory/ptr_util.h> #include "service/logging_helpers.h" +#include "types/raw_address.h" using bluetooth::hal::BluetoothAvInterface; diff --git a/system/service/a2dp_sink.h b/system/service/a2dp_sink.h index 7a62805d1b..7bf59026ac 100644 --- a/system/service/a2dp_sink.h +++ b/system/service/a2dp_sink.h @@ -16,15 +16,16 @@ #pragma once +#include <base/macros.h> + #include <atomic> #include <mutex> #include <string> #include <vector> -#include <base/macros.h> - #include "service/bluetooth_instance.h" #include "service/hal/bluetooth_av_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/a2dp_source.cc b/system/service/a2dp_source.cc index 827cf51471..c77466badb 100644 --- a/system/service/a2dp_source.cc +++ b/system/service/a2dp_source.cc @@ -19,6 +19,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "service/logging_helpers.h" +#include "types/raw_address.h" #define PARSE_ADDR(str) \ ({ \ diff --git a/system/service/a2dp_source.h b/system/service/a2dp_source.h index 53da6bd276..801393f4d1 100644 --- a/system/service/a2dp_source.h +++ b/system/service/a2dp_source.h @@ -16,16 +16,17 @@ #pragma once +#include <base/macros.h> + #include <atomic> #include <mutex> #include <string> #include <vector> -#include <base/macros.h> - #include "service/bluetooth_instance.h" #include "service/common/bluetooth/a2dp_codec_config.h" #include "service/hal/bluetooth_av_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/adapter.cc b/system/service/adapter.cc index 40ed9dc77e..9c0468899a 100644 --- a/system/service/adapter.cc +++ b/system/service/adapter.cc @@ -16,14 +16,14 @@ #include "service/adapter.h" +#include <base/logging.h> +#include <base/observer_list.h> + #include <atomic> #include <mutex> #include <string> #include <unordered_set> -#include <base/logging.h> -#include <base/observer_list.h> - #include "abstract_observer_list.h" #include "notreached.h" #include "service/a2dp_sink.h" @@ -38,6 +38,7 @@ #include "service/low_energy_advertiser.h" #include "service/low_energy_client.h" #include "service/low_energy_scanner.h" +#include "types/raw_address.h" using std::lock_guard; using std::mutex; diff --git a/system/service/avrcp_control.cc b/system/service/avrcp_control.cc index 96460ce756..1e4c24ae4a 100644 --- a/system/service/avrcp_control.cc +++ b/system/service/avrcp_control.cc @@ -16,19 +16,18 @@ #include "service/avrcp_control.h" -#include <cerrno> -#include <climits> -#include <string> - #include <base/logging.h> #include <base/memory/ptr_util.h> #include <base/strings/string_number_conversions.h> +#include <cerrno> +#include <climits> +#include <string> + #include "notreached.h" #include "service/logging_helpers.h" - #include "stack/include/avrc_defs.h" - +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/avrcp_control.h b/system/service/avrcp_control.h index 7cde24d2f8..eef36f8927 100644 --- a/system/service/avrcp_control.h +++ b/system/service/avrcp_control.h @@ -20,12 +20,12 @@ #include <mutex> #include "base/macros.h" - #include "bluetooth/uuid.h" #include "service/bluetooth_instance.h" #include "service/common/bluetooth/avrcp_media_attr.h" #include "service/common/bluetooth/service.h" #include "service/hal/bluetooth_avrcp_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/avrcp_target.cc b/system/service/avrcp_target.cc index 1ba9b21122..f5d21b72a5 100644 --- a/system/service/avrcp_target.cc +++ b/system/service/avrcp_target.cc @@ -21,13 +21,13 @@ #include <climits> #include <string> +#include "array_utils.h" #include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "service/logging_helpers.h" - -#include "array_utils.h" #include "stack/include/avrc_defs.h" +#include "types/raw_address.h" #define PARSE_ADDR(str) \ ({ \ diff --git a/system/service/avrcp_target.h b/system/service/avrcp_target.h index 8c2bcceb0b..e0ee57bb5a 100644 --- a/system/service/avrcp_target.h +++ b/system/service/avrcp_target.h @@ -21,13 +21,12 @@ #include <vector> #include "base/macros.h" - +#include "service/bluetooth_instance.h" #include "service/common/bluetooth/avrcp_int_value.h" #include "service/common/bluetooth/avrcp_register_notification_response.h" #include "service/common/bluetooth/avrcp_string_value.h" - -#include "service/bluetooth_instance.h" #include "service/hal/bluetooth_avrcp_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/gatt_server.cc b/system/service/gatt_server.cc index 0190068899..5167fc17cf 100644 --- a/system/service/gatt_server.cc +++ b/system/service/gatt_server.cc @@ -20,6 +20,7 @@ #include "service/logging_helpers.h" #include "stack/include/bt_types.h" +#include "types/raw_address.h" using std::lock_guard; using std::mutex; diff --git a/system/service/gatt_server.h b/system/service/gatt_server.h index ee3970b0f9..c46e8d00c4 100644 --- a/system/service/gatt_server.h +++ b/system/service/gatt_server.h @@ -16,6 +16,9 @@ #pragma once +#include <base/macros.h> +#include <bluetooth/uuid.h> + #include <deque> #include <functional> #include <mutex> @@ -24,12 +27,10 @@ #include <unordered_set> #include <vector> -#include <base/macros.h> -#include <bluetooth/uuid.h> - #include "service/bluetooth_instance.h" #include "service/common/bluetooth/service.h" #include "service/hal/bluetooth_gatt_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/gatt_server_old.cc b/system/service/gatt_server_old.cc index 9c662e72d2..7e2b6ab75d 100644 --- a/system/service/gatt_server_old.cc +++ b/system/service/gatt_server_old.cc @@ -18,12 +18,14 @@ #include "gatt_server_old.h" +#include <base/bind.h> +#include <base/callback.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <base/bind.h> -#include <base/callback.h> #include <algorithm> #include <array> #include <condition_variable> @@ -36,16 +38,12 @@ #include <unordered_set> #include <vector> -#include <hardware/bluetooth.h> -#include <hardware/bt_gatt.h> - #include "bind_helpers.h" - -#include "service/hal/bluetooth_interface.h" -#include "service/logging_helpers.h" - #include "osi/include/log.h" #include "osi/include/osi.h" +#include "service/hal/bluetooth_interface.h" +#include "service/logging_helpers.h" +#include "types/raw_address.h" namespace { diff --git a/system/service/hal/bluetooth_av_interface.cc b/system/service/hal/bluetooth_av_interface.cc index 8dc8686226..e4a759dd9f 100644 --- a/system/service/hal/bluetooth_av_interface.cc +++ b/system/service/hal/bluetooth_av_interface.cc @@ -16,14 +16,15 @@ #include "service/hal/bluetooth_av_interface.h" -#include <shared_mutex> - #include <base/logging.h> #include <base/memory/ptr_util.h> #include <base/observer_list.h> +#include <shared_mutex> + #include "abstract_observer_list.h" #include "service/hal/bluetooth_interface.h" +#include "types/raw_address.h" namespace bluetooth { namespace hal { diff --git a/system/service/hal/bluetooth_av_interface.h b/system/service/hal/bluetooth_av_interface.h index eda6476b1e..2b444b2b67 100644 --- a/system/service/hal/bluetooth_av_interface.h +++ b/system/service/hal/bluetooth_av_interface.h @@ -22,6 +22,8 @@ #include <vector> +#include "types/raw_address.h" + namespace bluetooth { namespace hal { diff --git a/system/service/hal/bluetooth_avrcp_interface.cc b/system/service/hal/bluetooth_avrcp_interface.cc index 68746aec04..42ac0a6372 100644 --- a/system/service/hal/bluetooth_avrcp_interface.cc +++ b/system/service/hal/bluetooth_avrcp_interface.cc @@ -16,15 +16,16 @@ #include "service/hal/bluetooth_avrcp_interface.h" -#include <mutex> -#include <shared_mutex> - #include <base/logging.h> #include <base/observer_list.h> +#include <mutex> +#include <shared_mutex> + #include "abstract_observer_list.h" #include "service/hal/bluetooth_interface.h" #include "service/logging_helpers.h" +#include "types/raw_address.h" using std::lock_guard; using std::mutex; diff --git a/system/service/hal/bluetooth_avrcp_interface.h b/system/service/hal/bluetooth_avrcp_interface.h index 08d6989711..fc67c3c41f 100644 --- a/system/service/hal/bluetooth_avrcp_interface.h +++ b/system/service/hal/bluetooth_avrcp_interface.h @@ -20,6 +20,8 @@ #include <hardware/bluetooth.h> #include <hardware/bt_rc.h> +#include "types/raw_address.h" + namespace bluetooth { namespace hal { diff --git a/system/service/hal/bluetooth_gatt_interface.cc b/system/service/hal/bluetooth_gatt_interface.cc index 6445d11f85..80a9a1ad65 100644 --- a/system/service/hal/bluetooth_gatt_interface.cc +++ b/system/service/hal/bluetooth_gatt_interface.cc @@ -16,15 +16,16 @@ #include "service/hal/bluetooth_gatt_interface.h" -#include <mutex> -#include <shared_mutex> - #include <base/logging.h> #include <base/observer_list.h> +#include <mutex> +#include <shared_mutex> + #include "abstract_observer_list.h" #include "service/hal/bluetooth_interface.h" #include "service/logging_helpers.h" +#include "types/raw_address.h" using std::lock_guard; using std::unique_lock; diff --git a/system/service/hal/bluetooth_gatt_interface.h b/system/service/hal/bluetooth_gatt_interface.h index ccd0ae9041..eabe464581 100644 --- a/system/service/hal/bluetooth_gatt_interface.h +++ b/system/service/hal/bluetooth_gatt_interface.h @@ -16,13 +16,15 @@ #pragma once +#include <base/macros.h> +#include <hardware/bluetooth.h> +#include <hardware/bt_gatt.h> + #include <mutex> #include <unordered_set> #include <vector> -#include <base/macros.h> -#include <hardware/bluetooth.h> -#include <hardware/bt_gatt.h> +#include "types/raw_address.h" namespace bluetooth { namespace hal { diff --git a/system/service/hal/bluetooth_interface.cc b/system/service/hal/bluetooth_interface.cc index f504ee10dd..391f6a4560 100644 --- a/system/service/hal/bluetooth_interface.cc +++ b/system/service/hal/bluetooth_interface.cc @@ -16,16 +16,16 @@ #include "service/hal/bluetooth_interface.h" -#include <mutex> -#include <shared_mutex> - #include <base/logging.h> #include <base/observer_list.h> -#include "abstract_observer_list.h" -#include "service/logging_helpers.h" +#include <mutex> +#include <shared_mutex> +#include "abstract_observer_list.h" #include "btcore/include/hal_util.h" +#include "service/logging_helpers.h" +#include "types/raw_address.h" using std::lock_guard; using std::unique_lock; diff --git a/system/service/hal/bluetooth_interface.h b/system/service/hal/bluetooth_interface.h index 65d3e45c08..0390cb0085 100644 --- a/system/service/hal/bluetooth_interface.h +++ b/system/service/hal/bluetooth_interface.h @@ -19,6 +19,8 @@ #include <base/macros.h> #include <hardware/bluetooth.h> +#include "types/raw_address.h" + namespace bluetooth { namespace hal { diff --git a/system/service/hal/fake_bluetooth_av_interface.cc b/system/service/hal/fake_bluetooth_av_interface.cc index 2607a665ca..64866a65b0 100644 --- a/system/service/hal/fake_bluetooth_av_interface.cc +++ b/system/service/hal/fake_bluetooth_av_interface.cc @@ -16,6 +16,8 @@ #include "service/hal/fake_bluetooth_av_interface.h" +#include "types/raw_address.h" + namespace bluetooth { namespace hal { namespace { diff --git a/system/service/hal/fake_bluetooth_av_interface.h b/system/service/hal/fake_bluetooth_av_interface.h index ee431b077c..c97c9a3180 100644 --- a/system/service/hal/fake_bluetooth_av_interface.h +++ b/system/service/hal/fake_bluetooth_av_interface.h @@ -21,6 +21,7 @@ #include "abstract_observer_list.h" #include "service/hal/bluetooth_av_interface.h" +#include "types/raw_address.h" namespace bluetooth { namespace hal { diff --git a/system/service/hal/fake_bluetooth_gatt_interface.cc b/system/service/hal/fake_bluetooth_gatt_interface.cc index 38ef289a16..8b77424167 100644 --- a/system/service/hal/fake_bluetooth_gatt_interface.cc +++ b/system/service/hal/fake_bluetooth_gatt_interface.cc @@ -16,6 +16,8 @@ #include "service/hal/fake_bluetooth_gatt_interface.h" +#include "types/raw_address.h" + namespace bluetooth { namespace hal { namespace { diff --git a/system/service/hal/fake_bluetooth_gatt_interface.h b/system/service/hal/fake_bluetooth_gatt_interface.h index b71d5f43be..d6e917fb9b 100644 --- a/system/service/hal/fake_bluetooth_gatt_interface.h +++ b/system/service/hal/fake_bluetooth_gatt_interface.h @@ -16,13 +16,14 @@ #pragma once -#include <vector> - #include <base/macros.h> #include <base/observer_list.h> +#include <vector> + #include "abstract_observer_list.h" #include "service/hal/bluetooth_gatt_interface.h" +#include "types/raw_address.h" namespace bluetooth { namespace hal { diff --git a/system/service/hal/fake_bluetooth_interface.cc b/system/service/hal/fake_bluetooth_interface.cc index 8a905bed28..e32c380e10 100644 --- a/system/service/hal/fake_bluetooth_interface.cc +++ b/system/service/hal/fake_bluetooth_interface.cc @@ -16,6 +16,8 @@ #include "service/hal/fake_bluetooth_interface.h" +#include "types/raw_address.h" + namespace bluetooth { namespace hal { diff --git a/system/service/hal/fake_bluetooth_interface.h b/system/service/hal/fake_bluetooth_interface.h index 7ff8e15e96..9ea99b50c4 100644 --- a/system/service/hal/fake_bluetooth_interface.h +++ b/system/service/hal/fake_bluetooth_interface.h @@ -19,6 +19,7 @@ #include "abstract_observer_list.h" #include "service/hal/bluetooth_interface.h" +#include "types/raw_address.h" namespace bluetooth { namespace hal { diff --git a/system/service/logging_helpers.cc b/system/service/logging_helpers.cc index 03d9370b0f..8b53033cc6 100644 --- a/system/service/logging_helpers.cc +++ b/system/service/logging_helpers.cc @@ -15,10 +15,11 @@ // #include "logging_helpers.h" -#include "types/bt_transport.h" - #include <string> +#include "types/bt_transport.h" +#include "types/raw_address.h" + #define CASE_RETURN_TEXT(code) \ case code: \ return #code diff --git a/system/service/logging_helpers.h b/system/service/logging_helpers.h index aa03e634cf..69124300ff 100644 --- a/system/service/logging_helpers.h +++ b/system/service/logging_helpers.h @@ -22,6 +22,7 @@ #include "hardware/bluetooth.h" #include "hardware/bt_av.h" #include "hardware/bt_gatt_types.h" +#include "types/raw_address.h" const char* BtAvConnectionStateText(const btav_connection_state_t state); diff --git a/system/service/low_energy_client.cc b/system/service/low_energy_client.cc index 7d75b034ab..98a76f97e5 100644 --- a/system/service/low_energy_client.cc +++ b/system/service/low_energy_client.cc @@ -22,6 +22,7 @@ #include "service/logging_helpers.h" #include "stack/include/bt_types.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using std::lock_guard; using std::mutex; diff --git a/system/service/low_energy_client.h b/system/service/low_energy_client.h index 4a7939bf36..a4b60c61e0 100644 --- a/system/service/low_energy_client.h +++ b/system/service/low_energy_client.h @@ -16,20 +16,21 @@ #pragma once +#include <base/macros.h> +#include <bluetooth/uuid.h> + #include <atomic> #include <functional> #include <map> #include <mutex> -#include <base/macros.h> -#include <bluetooth/uuid.h> - #include "service/bluetooth_instance.h" #include "service/common/bluetooth/low_energy_constants.h" #include "service/common/bluetooth/scan_filter.h" #include "service/common/bluetooth/scan_result.h" #include "service/common/bluetooth/scan_settings.h" #include "service/hal/bluetooth_gatt_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/low_energy_scanner.cc b/system/service/low_energy_scanner.cc index 043612deb8..8f25e858ce 100644 --- a/system/service/low_energy_scanner.cc +++ b/system/service/low_energy_scanner.cc @@ -16,14 +16,15 @@ #include "service/low_energy_scanner.h" -#include "service/adapter.h" -#include "service/logging_helpers.h" -#include "stack/include/bt_types.h" - #include <base/bind.h> #include <base/callback.h> #include <base/logging.h> +#include "service/adapter.h" +#include "service/logging_helpers.h" +#include "stack/include/bt_types.h" +#include "types/raw_address.h" + using std::lock_guard; using std::mutex; diff --git a/system/service/low_energy_scanner.h b/system/service/low_energy_scanner.h index b27b72e730..6325c41cf2 100644 --- a/system/service/low_energy_scanner.h +++ b/system/service/low_energy_scanner.h @@ -16,14 +16,14 @@ #pragma once +#include <base/macros.h> +#include <bluetooth/uuid.h> + #include <atomic> #include <functional> #include <map> #include <mutex> -#include <base/macros.h> -#include <bluetooth/uuid.h> - #include "service/bluetooth_instance.h" #include "service/common/bluetooth/advertise_data.h" #include "service/common/bluetooth/advertise_settings.h" @@ -32,6 +32,7 @@ #include "service/common/bluetooth/scan_result.h" #include "service/common/bluetooth/scan_settings.h" #include "service/hal/bluetooth_gatt_interface.h" +#include "types/raw_address.h" namespace bluetooth { diff --git a/system/service/test/a2dp_sink_unittest.cc b/system/service/test/a2dp_sink_unittest.cc index 06fb88e372..f51e11292d 100644 --- a/system/service/test/a2dp_sink_unittest.cc +++ b/system/service/test/a2dp_sink_unittest.cc @@ -14,11 +14,13 @@ // limitations under the License. // +#include "service/a2dp_sink.h" + #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "service/a2dp_sink.h" #include "service/hal/fake_bluetooth_av_interface.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/service/test/a2dp_source_unittest.cc b/system/service/test/a2dp_source_unittest.cc index 5fb196131c..5aede818fb 100644 --- a/system/service/test/a2dp_source_unittest.cc +++ b/system/service/test/a2dp_source_unittest.cc @@ -14,11 +14,13 @@ * limitations under the License. */ +#include "service/a2dp_source.h" + #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "service/a2dp_source.h" #include "service/hal/fake_bluetooth_av_interface.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/service/test/adapter_unittest.cc b/system/service/test/adapter_unittest.cc index 23d46a026d..37b0abbeb5 100644 --- a/system/service/test/adapter_unittest.cc +++ b/system/service/test/adapter_unittest.cc @@ -14,13 +14,15 @@ // limitations under the License. // +#include "service/adapter.h" + #include <base/macros.h> #include <gtest/gtest.h> -#include "service/adapter.h" #include "service/hal/fake_bluetooth_gatt_interface.h" #include "service/hal/fake_bluetooth_interface.h" #include "types/bt_transport.h" +#include "types/raw_address.h" namespace bluetooth { namespace { diff --git a/system/service/test/gatt_client_unittest.cc b/system/service/test/gatt_client_unittest.cc index a7d7e470d1..71850cdea9 100644 --- a/system/service/test/gatt_client_unittest.cc +++ b/system/service/test/gatt_client_unittest.cc @@ -14,12 +14,14 @@ // limitations under the License. // +#include "service/gatt_client.h" + #include <base/macros.h> #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "service/gatt_client.h" #include "service/hal/fake_bluetooth_gatt_interface.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/service/test/gatt_server_unittest.cc b/system/service/test/gatt_server_unittest.cc index 962697d098..467100c170 100644 --- a/system/service/test/gatt_server_unittest.cc +++ b/system/service/test/gatt_server_unittest.cc @@ -14,11 +14,13 @@ // limitations under the License. // +#include "service/gatt_server.h" + #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "service/gatt_server.h" #include "service/hal/fake_bluetooth_gatt_interface.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/service/test/low_energy_client_unittest.cc b/system/service/test/low_energy_client_unittest.cc index 74bc3723ac..389d758237 100644 --- a/system/service/test/low_energy_client_unittest.cc +++ b/system/service/test/low_energy_client_unittest.cc @@ -14,16 +14,18 @@ // limitations under the License. // +#include "service/low_energy_client.h" + #include <base/macros.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include "service/adapter.h" #include "service/hal/fake_bluetooth_gatt_interface.h" -#include "service/low_energy_client.h" #include "stack/include/bt_types.h" #include "test/mock_adapter.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/service/test/low_energy_scanner_unittest.cc b/system/service/test/low_energy_scanner_unittest.cc index 3e0f9e30ea..9cfca19097 100644 --- a/system/service/test/low_energy_scanner_unittest.cc +++ b/system/service/test/low_energy_scanner_unittest.cc @@ -14,16 +14,19 @@ // limitations under the License. // +#include "service/low_energy_scanner.h" + #include <base/macros.h> #include <gmock/gmock.h> #include <gtest/gtest.h> + #include <memory> #include "service/adapter.h" #include "service/hal/fake_bluetooth_gatt_interface.h" -#include "service/low_energy_scanner.h" #include "stack/include/bt_types.h" #include "test/mock_adapter.h" +#include "types/raw_address.h" using ::testing::_; using ::testing::Return; diff --git a/system/stack/a2dp/a2dp_api.cc b/system/stack/a2dp/a2dp_api.cc index 7c980ec6b4..270546d2bf 100644 --- a/system/stack/a2dp/a2dp_api.cc +++ b/system/stack/a2dp/a2dp_api.cc @@ -34,6 +34,7 @@ #include "osi/include/allocator.h" #include "osi/include/log.h" #include "sdpdefs.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/acl/ble_acl.cc b/system/stack/acl/ble_acl.cc index a4996e2b94..394629f1d7 100644 --- a/system/stack/acl/ble_acl.cc +++ b/system/stack/acl/ble_acl.cc @@ -24,6 +24,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_types.h" #include "stack/include/l2cap_hci_link_interface.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/stack/acl/btm_ble_connection_establishment.cc b/system/stack/acl/btm_ble_connection_establishment.cc index 9df73f93e2..61355ca678 100644 --- a/system/stack/acl/btm_ble_connection_establishment.cc +++ b/system/stack/acl/btm_ble_connection_establishment.cc @@ -33,6 +33,7 @@ #include "stack/include/ble_hci_link_interface.h" #include "stack/include/l2cap_hci_link_interface.h" #include "stack/include/stack_metrics_logging.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/stack/avct/avct_api.cc b/system/stack/avct/avct_api.cc index 67c1439f0e..6720ef4532 100644 --- a/system/stack/avct/avct_api.cc +++ b/system/stack/avct/avct_api.cc @@ -37,6 +37,7 @@ #include "osi/include/osi.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* Control block for AVCT */ tAVCT_CB avct_cb; diff --git a/system/stack/avct/avct_ccb.cc b/system/stack/avct/avct_ccb.cc index cc3d49fd85..09871cba73 100644 --- a/system/stack/avct/avct_ccb.cc +++ b/system/stack/avct/avct_ccb.cc @@ -24,9 +24,11 @@ ******************************************************************************/ #include <string.h> + #include "avct_api.h" #include "avct_int.h" #include "bt_target.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/stack/avct/avct_int.h b/system/stack/avct/avct_int.h index c647b970e6..8975380190 100644 --- a/system/stack/avct/avct_int.h +++ b/system/stack/avct/avct_int.h @@ -29,6 +29,7 @@ #include "l2c_api.h" #include "osi/include/fixed_queue.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * constants diff --git a/system/stack/avct/avct_l2c.cc b/system/stack/avct/avct_l2c.cc index eb623e02cb..0af6e3306f 100644 --- a/system/stack/avct/avct_l2c.cc +++ b/system/stack/avct/avct_l2c.cc @@ -30,6 +30,7 @@ #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* callback function declarations */ void avct_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, diff --git a/system/stack/avct/avct_l2c_br.cc b/system/stack/avct/avct_l2c_br.cc index 2955ed50f9..3bb50c7655 100644 --- a/system/stack/avct/avct_l2c_br.cc +++ b/system/stack/avct/avct_l2c_br.cc @@ -32,6 +32,7 @@ #include "osi/include/allocator.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* callback function declarations */ void avct_l2c_br_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc index 032c79c50d..c4f82014f5 100644 --- a/system/stack/avct/avct_lcb.cc +++ b/system/stack/avct/avct_lcb.cc @@ -25,12 +25,14 @@ #include <base/logging.h> #include <string.h> + #include "avct_api.h" #include "avct_int.h" #include "bt_target.h" #include "bt_utils.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" +#include "types/raw_address.h" /***************************************************************************** * state machine constants and types diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc index e0fc3186fb..a5f53885e8 100644 --- a/system/stack/avdt/avdt_api.cc +++ b/system/stack/avdt/avdt_api.cc @@ -38,6 +38,7 @@ #include "stack/btm/btm_sec.h" #include "stack/include/a2dp_codec_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* Control block for AVDTP */ AvdtpCb avdtp_cb; diff --git a/system/stack/avdt/avdt_ccb.cc b/system/stack/avdt/avdt_ccb.cc index 4c01a83e83..11d987c4a2 100644 --- a/system/stack/avdt/avdt_ccb.cc +++ b/system/stack/avdt/avdt_ccb.cc @@ -24,12 +24,14 @@ ******************************************************************************/ #include <string.h> + #include "avdt_api.h" #include "avdt_int.h" #include "avdtc_api.h" #include "bt_target.h" #include "bt_utils.h" #include "osi/include/osi.h" +#include "types/raw_address.h" /***************************************************************************** * state machine constants and types diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc index 86500099d5..a52d704ac0 100644 --- a/system/stack/avdt/avdt_ccb_act.cc +++ b/system/stack/avdt/avdt_ccb_act.cc @@ -35,6 +35,7 @@ #include "osi/include/osi.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/stack/avdt/avdt_int.h b/system/stack/avdt/avdt_int.h index cc794969f4..d872573d58 100644 --- a/system/stack/avdt/avdt_int.h +++ b/system/stack/avdt/avdt_int.h @@ -34,6 +34,7 @@ #include "osi/include/alarm.h" #include "osi/include/fixed_queue.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef AVDT_DEBUG #define AVDT_DEBUG FALSE diff --git a/system/stack/avdt/avdt_l2c.cc b/system/stack/avdt/avdt_l2c.cc index 0a0e9f9d39..75fe2e8120 100644 --- a/system/stack/avdt/avdt_l2c.cc +++ b/system/stack/avdt/avdt_l2c.cc @@ -33,6 +33,7 @@ #include "osi/include/osi.h" #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* callback function declarations */ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc index d88da4ccdb..7e3b92a753 100644 --- a/system/stack/avdt/avdt_scb_act.cc +++ b/system/stack/avdt/avdt_scb_act.cc @@ -37,6 +37,7 @@ #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* This table is used to lookup the callback event that matches a particular * state machine API request event. Note that state machine API request diff --git a/system/stack/avrc/avrc_api.cc b/system/stack/avrc/avrc_api.cc index 856e533f34..392286b5e5 100644 --- a/system/stack/avrc/avrc_api.cc +++ b/system/stack/avrc/avrc_api.cc @@ -33,6 +33,7 @@ #include "osi/include/osi.h" #include "osi/include/properties.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Global data diff --git a/system/stack/avrc/avrc_sdp.cc b/system/stack/avrc/avrc_sdp.cc index bd1c3894cd..5e73864a05 100644 --- a/system/stack/avrc/avrc_sdp.cc +++ b/system/stack/avrc/avrc_sdp.cc @@ -25,6 +25,7 @@ #include "avrc_api.h" #include "avrc_int.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/bnep/bnep_api.cc b/system/stack/bnep/bnep_api.cc index 2398d95d36..69f51461c4 100644 --- a/system/stack/bnep/bnep_api.cc +++ b/system/stack/bnep/bnep_api.cc @@ -31,6 +31,7 @@ #include "osi/include/allocator.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/bnep/bnep_int.h b/system/stack/bnep/bnep_int.h index 981b133d43..fd396e0ee1 100644 --- a/system/stack/bnep/bnep_int.h +++ b/system/stack/bnep/bnep_int.h @@ -30,6 +30,7 @@ #include "osi/include/alarm.h" #include "osi/include/fixed_queue.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /* BNEP frame types */ diff --git a/system/stack/bnep/bnep_main.cc b/system/stack/bnep/bnep_main.cc index cdba74a021..2abe0a687d 100644 --- a/system/stack/bnep/bnep_main.cc +++ b/system/stack/bnep/bnep_main.cc @@ -38,6 +38,7 @@ #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /******************************************************************************/ /* G L O B A L B N E P D A T A */ diff --git a/system/stack/bnep/bnep_utils.cc b/system/stack/bnep/bnep_utils.cc index b3c02a0475..17a24094e4 100644 --- a/system/stack/bnep/bnep_utils.cc +++ b/system/stack/bnep/bnep_utils.cc @@ -32,6 +32,7 @@ #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/btm/ble_advertiser_hci_interface.cc b/system/stack/btm/ble_advertiser_hci_interface.cc index 6d6d847018..c5b852c94d 100644 --- a/system/stack/btm/ble_advertiser_hci_interface.cc +++ b/system/stack/btm/ble_advertiser_hci_interface.cc @@ -17,21 +17,22 @@ ******************************************************************************/ #include "ble_advertiser_hci_interface.h" -#include "btm_api.h" -#include "btm_ble_api.h" -#include "btm_int_types.h" -#include "device/include/controller.h" - -#include "osi/include/log.h" - -#include <queue> -#include <utility> #include <base/bind.h> #include <base/callback.h> #include <base/location.h> #include <base/logging.h> +#include <queue> +#include <utility> + +#include "btm_api.h" +#include "btm_ble_api.h" +#include "btm_int_types.h" +#include "device/include/controller.h" +#include "osi/include/log.h" +#include "types/raw_address.h" + #define BTM_BLE_MULTI_ADV_SET_RANDOM_ADDR_LEN 8 #define BTM_BLE_MULTI_ADV_ENB_LEN 3 #define BTM_BLE_MULTI_ADV_SET_PARAM_LEN 24 diff --git a/system/stack/btm/ble_advertiser_hci_interface.h b/system/stack/btm/ble_advertiser_hci_interface.h index 24e501dbfb..ac382024a4 100644 --- a/system/stack/btm/ble_advertiser_hci_interface.h +++ b/system/stack/btm/ble_advertiser_hci_interface.h @@ -19,10 +19,12 @@ #ifndef BLE_ADVERTISER_HCI_INTERFACE_H #define BLE_ADVERTISER_HCI_INTERFACE_H +#include <base/callback.h> + #include <vector> -#include "stack/include/bt_types.h" -#include <base/callback.h> +#include "stack/include/bt_types.h" +#include "types/raw_address.h" /* This class is an abstraction of HCI commands used for managing * advertisements. Please see VSC HCI SPEC at diff --git a/system/stack/btm/ble_scanner_hci_interface.cc b/system/stack/btm/ble_scanner_hci_interface.cc index d3fcde7a41..8056064538 100644 --- a/system/stack/btm/ble_scanner_hci_interface.cc +++ b/system/stack/btm/ble_scanner_hci_interface.cc @@ -22,8 +22,8 @@ #include "acl_api.h" #include "btm_api.h" #include "device/include/controller.h" - #include "osi/include/log.h" +#include "types/raw_address.h" namespace { BleScannerHciInterface* instance = nullptr; diff --git a/system/stack/btm/ble_scanner_hci_interface.h b/system/stack/btm/ble_scanner_hci_interface.h index f7b233c70a..df0541c362 100644 --- a/system/stack/btm/ble_scanner_hci_interface.h +++ b/system/stack/btm/ble_scanner_hci_interface.h @@ -23,6 +23,7 @@ #include <vector> #include "stack/include/bt_types.h" +#include "types/raw_address.h" class BleScannerHciInterface { public: diff --git a/system/stack/btm/btm_ble_adv_filter.cc b/system/stack/btm/btm_ble_adv_filter.cc index f0f384e3ab..37ef092bad 100644 --- a/system/stack/btm/btm_ble_adv_filter.cc +++ b/system/stack/btm/btm_ble_adv_filter.cc @@ -18,8 +18,14 @@ #define LOG_TAG "bt_btm_ble" -#include "bt_target.h" +#include <base/bind.h> +#include <string.h> + +#include <algorithm> +#include <vector> +#include "bind_helpers.h" +#include "bt_target.h" #include "btm_ble_api.h" #include "btm_dev.h" #include "btm_int.h" @@ -27,16 +33,9 @@ #include "device/include/controller.h" #include "stack/btm/btm_ble_int.h" #include "stack/btm/btm_int_types.h" +#include "types/raw_address.h" #include "utils/include/bt_utils.h" -#include <string.h> -#include <algorithm> -#include <vector> - -#include <base/bind.h> - -#include "bind_helpers.h" - extern tBTM_CB btm_cb; using base::Bind; diff --git a/system/stack/btm/btm_ble_int.h b/system/stack/btm/btm_ble_int.h index 5ca2b08f8e..0e2223b94a 100644 --- a/system/stack/btm/btm_ble_int.h +++ b/system/stack/btm/btm_ble_int.h @@ -32,6 +32,7 @@ #include "btm_int_types.h" #include "smp_api.h" #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len, uint8_t* p); extern void btm_ble_process_periodic_adv_pkt(uint8_t len, uint8_t* p); diff --git a/system/stack/btm/btm_ble_int_types.h b/system/stack/btm/btm_ble_int_types.h index e98d1e0cc0..d53dcaf588 100644 --- a/system/stack/btm/btm_ble_int_types.h +++ b/system/stack/btm/btm_ble_int_types.h @@ -22,6 +22,7 @@ #include "osi/include/alarm.h" #include "stack/btm/neighbor_inquiry.h" #include "stack/include/btm_ble_api_types.h" +#include "types/raw_address.h" /* scanning enable status */ #define BTM_BLE_SCAN_ENABLE 0x01 diff --git a/system/stack/btm/btm_ble_multi_adv.cc b/system/stack/btm/btm_ble_multi_adv.cc index a7361f550c..0caf575450 100644 --- a/system/stack/btm/btm_ble_multi_adv.cc +++ b/system/stack/btm/btm_ble_multi_adv.cc @@ -17,27 +17,26 @@ * ******************************************************************************/ -#include "bt_target.h" -#include "device/include/controller.h" -#include "osi/include/alarm.h" - -#include "ble_advertiser.h" -#include "ble_advertiser_hci_interface.h" -#include "btm_int_types.h" -#include "stack/btm/btm_ble_int.h" - -#include <string.h> -#include <queue> -#include <vector> - #include <base/bind.h> #include <base/location.h> #include <base/logging.h> #include <base/memory/weak_ptr.h> #include <base/strings/string_number_conversions.h> #include <base/time/time.h> +#include <string.h> + +#include <queue> +#include <vector> #include "bind_helpers.h" +#include "ble_advertiser.h" +#include "ble_advertiser_hci_interface.h" +#include "bt_target.h" +#include "btm_int_types.h" +#include "device/include/controller.h" +#include "osi/include/alarm.h" +#include "stack/btm/btm_ble_int.h" +#include "types/raw_address.h" using base::Bind; using base::TimeDelta; diff --git a/system/stack/btm/btm_ble_privacy.cc b/system/stack/btm/btm_ble_privacy.cc index 06272ee6f5..e53713c7fa 100644 --- a/system/stack/btm/btm_ble_privacy.cc +++ b/system/stack/btm/btm_ble_privacy.cc @@ -22,12 +22,13 @@ * ******************************************************************************/ #include <string.h> -#include "bt_target.h" #include "ble_advertiser.h" +#include "bt_target.h" #include "btm_int.h" #include "device/include/controller.h" #include "stack/btm/btm_dev.h" +#include "types/raw_address.h" #include "vendor_hcidefs.h" extern tBTM_CB btm_cb; diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc index 0da21d8c80..c396be068a 100644 --- a/system/stack/btm/btm_dev.cc +++ b/system/stack/btm/btm_dev.cc @@ -37,6 +37,7 @@ #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "stack/include/acl_api.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/stack/btm/btm_devctl.cc b/system/stack/btm/btm_devctl.cc index 2c74ad7eec..f878c6e611 100644 --- a/system/stack/btm/btm_devctl.cc +++ b/system/stack/btm/btm_devctl.cc @@ -48,6 +48,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/l2cap_controller_interface.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc index 0902a10eb9..122382d8f8 100644 --- a/system/stack/btm/btm_inq.cc +++ b/system/stack/btm/btm_inq.cc @@ -48,6 +48,7 @@ #include "stack/include/btm_api.h" #include "stack/include/btm_ble_api.h" #include "stack/include/inq_hci_link_interface.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; diff --git a/system/stack/btm/btm_int_types.h b/system/stack/btm/btm_int_types.h index 9096ecc81a..318a4288b0 100644 --- a/system/stack/btm/btm_int_types.h +++ b/system/stack/btm/btm_int_types.h @@ -33,6 +33,7 @@ #include "stack/btm/security_device_record.h" #include "stack/include/btm_ble_api_types.h" #include "stack/include/security_client_callbacks.h" +#include "types/raw_address.h" #define BTM_MAX_SCN_ 31 // PORT_MAX_RFC_PORTS packages/modules/Bluetooth/system/stack/include/rfcdefs.h diff --git a/system/stack/btm/btm_main.cc b/system/stack/btm/btm_main.cc index f77a693f6e..1344560a8c 100644 --- a/system/stack/btm/btm_main.cc +++ b/system/stack/btm/btm_main.cc @@ -24,11 +24,13 @@ #include <memory> #include <string> + #include "bt_target.h" #include "main/shim/dumpsys.h" #include "stack/btm/btm_int_types.h" #include "stack/include/btm_client_interface.h" #include "stack_config.h" +#include "types/raw_address.h" /* Global BTM control block structure */ diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index d22fbb8b08..02bb427929 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -51,6 +51,7 @@ #include "stack/include/l2cap_security_interface.h" #include "stack/include/stack_metrics_logging.h" #include "stack/smp/smp_int.h" +#include "types/raw_address.h" namespace { diff --git a/system/stack/btm/btm_sec.h b/system/stack/btm/btm_sec.h index 691d96eaf1..dcf734f731 100644 --- a/system/stack/btm/btm_sec.h +++ b/system/stack/btm/btm_sec.h @@ -24,11 +24,13 @@ #pragma once #include <cstdint> + #include "stack/btm/security_device_record.h" #include "stack/include/btm_api_types.h" #include "stack/include/hci_error_code.h" #include "stack/include/security_client_callbacks.h" #include "types/hci_role.h" +#include "types/raw_address.h" #define BTM_SEC_MAX_COLLISION_DELAY (5000) diff --git a/system/stack/btu/btu_hcif.cc b/system/stack/btu/btu_hcif.cc index fc85834d6b..0554a823e1 100644 --- a/system/stack/btu/btu_hcif.cc +++ b/system/stack/btu/btu_hcif.cc @@ -54,6 +54,7 @@ #include "stack/include/sec_hci_link_interface.h" #include "stack/include/stack_metrics_logging.h" #include "types/hci_role.h" +#include "types/raw_address.h" using base::Location; using bluetooth::hci::IsoManager; diff --git a/system/stack/eatt/eatt.cc b/system/stack/eatt/eatt.cc index 29ba3cc1e5..6d90e29ee9 100644 --- a/system/stack/eatt/eatt.cc +++ b/system/stack/eatt/eatt.cc @@ -18,6 +18,7 @@ #include "eatt_impl.h" #include "stack/include/bt_hdr.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" using bluetooth::eatt::eatt_impl; diff --git a/system/stack/eatt/eatt.h b/system/stack/eatt/eatt.h index 0af2fe3def..d2071ab7a1 100644 --- a/system/stack/eatt/eatt.h +++ b/system/stack/eatt/eatt.h @@ -20,6 +20,7 @@ #include <queue> #include "stack/gatt/gatt_int.h" +#include "types/raw_address.h" #define EATT_MIN_MTU_MPS (64) #define EATT_DEFAULT_MTU (256) @@ -281,4 +282,4 @@ class EattExtension { }; } // namespace eatt -} // namespace bluetooth
\ No newline at end of file +} // namespace bluetooth diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h index 6e72c94fdc..1852aa0483 100644 --- a/system/stack/eatt/eatt_impl.h +++ b/system/stack/eatt/eatt_impl.h @@ -29,6 +29,7 @@ #include "stack/gatt/gatt_int.h" #include "stack/include/bt_hdr.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" namespace bluetooth { namespace eatt { diff --git a/system/stack/gap/gap_ble.cc b/system/stack/gap/gap_ble.cc index e3175cc6f7..499f331ffd 100644 --- a/system/stack/gap/gap_ble.cc +++ b/system/stack/gap/gap_ble.cc @@ -19,14 +19,17 @@ #include <base/logging.h> #include <base/strings/stringprintf.h> #include <string.h> + #include <array> #include <list> #include <queue> + #include "gap_api.h" #include "gatt_api.h" #include "main/shim/dumpsys.h" #include "osi/include/log.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using base::StringPrintf; using bluetooth::Uuid; diff --git a/system/stack/gap/gap_conn.cc b/system/stack/gap/gap_conn.cc index 7b00961c1e..2275779e21 100644 --- a/system/stack/gap/gap_conn.cc +++ b/system/stack/gap/gap_conn.cc @@ -29,6 +29,7 @@ #include "osi/include/mutex.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using base::StringPrintf; diff --git a/system/stack/gatt/connection_manager.cc b/system/stack/gatt/connection_manager.cc index 4c01d13a77..8c73af99c5 100644 --- a/system/stack/gatt/connection_manager.cc +++ b/system/stack/gatt/connection_manager.cc @@ -22,6 +22,7 @@ #include <base/callback.h> #include <base/location.h> #include <base/logging.h> + #include <map> #include <memory> #include <set> @@ -32,6 +33,7 @@ #include "osi/include/log.h" #include "stack/btm/btm_ble_bgconn.h" #include "stack/include/l2c_api.h" +#include "types/raw_address.h" #define DIRECT_CONNECT_TIMEOUT (30 * 1000) /* 30 seconds */ diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc index efab28f296..e0fc455e4c 100644 --- a/system/stack/gatt/gatt_api.cc +++ b/system/stack/gatt/gatt_api.cc @@ -38,6 +38,7 @@ #include "stack/gatt/connection_manager.h" #include "stack/include/bt_hdr.h" #include "types/bt_transport.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/gatt/gatt_attr.cc b/system/stack/gatt/gatt_attr.cc index 8228df8620..4389c5480f 100644 --- a/system/stack/gatt/gatt_attr.cc +++ b/system/stack/gatt/gatt_attr.cc @@ -35,6 +35,7 @@ #include "gd/common/init_flags.h" #include "osi/include/log.h" #include "osi/include/osi.h" +#include "types/raw_address.h" using base::StringPrintf; using bluetooth::Uuid; diff --git a/system/stack/gatt/gatt_auth.cc b/system/stack/gatt/gatt_auth.cc index fc7c409a50..b373034583 100644 --- a/system/stack/gatt/gatt_auth.cc +++ b/system/stack/gatt/gatt_auth.cc @@ -34,6 +34,7 @@ #include "stack/btm/btm_int.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using base::StringPrintf; diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h index 0b32ee94ca..2b27b4ab6f 100644 --- a/system/stack/gatt/gatt_int.h +++ b/system/stack/gatt/gatt_int.h @@ -34,6 +34,7 @@ #include "gatt_api.h" #include "osi/include/fixed_queue.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #define GATT_CREATE_CONN_ID(tcb_idx, gatt_if) \ ((uint16_t)((((uint8_t)(tcb_idx)) << 8) | ((uint8_t)(gatt_if)))) diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc index 8621288647..e97c8cb4ee 100644 --- a/system/stack/gatt/gatt_main.cc +++ b/system/stack/gatt/gatt_main.cc @@ -37,6 +37,7 @@ #include "stack/gatt/gatt_int.h" #include "stack/include/bt_hdr.h" #include "stack/include/l2cap_acl_interface.h" +#include "types/raw_address.h" using base::StringPrintf; using bluetooth::eatt::EattExtension; diff --git a/system/stack/hcic/hciblecmds.cc b/system/stack/hcic/hciblecmds.cc index cffb3b67e3..ef62c7de89 100644 --- a/system/stack/hcic/hciblecmds.cc +++ b/system/stack/hcic/hciblecmds.cc @@ -35,6 +35,7 @@ #include "hcimsgs.h" #include "osi/include/allocator.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /******************************************************************************* * BLE Commands diff --git a/system/stack/hcic/hcicmds.cc b/system/stack/hcic/hcicmds.cc index 5c525341fc..c124cc0fb8 100644 --- a/system/stack/hcic/hcicmds.cc +++ b/system/stack/hcic/hcicmds.cc @@ -35,6 +35,7 @@ #include "osi/include/allocator.h" #include "stack/include/acl_hci_link_interface.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" void bte_main_hci_send(BT_HDR* p_msg, uint16_t event); diff --git a/system/stack/hid/hidd_api.cc b/system/stack/hid/hidd_api.cc index c5a7dee1f0..cbceb6ee14 100644 --- a/system/stack/hid/hidd_api.cc +++ b/system/stack/hid/hidd_api.cc @@ -23,16 +23,18 @@ * ******************************************************************************/ +#include "hidd_api.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> #include "btm_api.h" -#include "hidd_api.h" #include "hidd_int.h" #include "hiddefs.h" #include "osi/include/allocator.h" #include "stack/btm/btm_sec.h" +#include "types/raw_address.h" tHID_DEV_CTB hd_cb; diff --git a/system/stack/hid/hidh_api.cc b/system/stack/hid/hidh_api.cc index e519e00eb7..0f8ab4a452 100644 --- a/system/stack/hid/hidh_api.cc +++ b/system/stack/hid/hidh_api.cc @@ -35,6 +35,7 @@ #include "stack/btm/btm_dev.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc index b407078fcf..f1beab3d21 100644 --- a/system/stack/hid/hidh_conn.cc +++ b/system/stack/hid/hidh_conn.cc @@ -38,6 +38,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/btm_api.h" // BTM_LogHistory +#include "types/raw_address.h" namespace { constexpr char kBtmLogTag[] = "HIDH"; diff --git a/system/stack/include/a2dp_codec_api.h b/system/stack/include/a2dp_codec_api.h index eed156a4a9..48a6a0c824 100644 --- a/system/stack/include/a2dp_codec_api.h +++ b/system/stack/include/a2dp_codec_api.h @@ -35,6 +35,7 @@ #include "audio_a2dp_hw/include/audio_a2dp_hw.h" #include "avdt_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" class tBT_A2DP_OFFLOAD; diff --git a/system/stack/include/avct_api.h b/system/stack/include/avct_api.h index 386d2eba8d..3e049e6202 100644 --- a/system/stack/include/avct_api.h +++ b/system/stack/include/avct_api.h @@ -27,6 +27,7 @@ #include "bt_target.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/avdt_api.h b/system/stack/include/avdt_api.h index c27d569241..f051b09516 100644 --- a/system/stack/include/avdt_api.h +++ b/system/stack/include/avdt_api.h @@ -33,6 +33,7 @@ #include "bt_target.h" #include "osi/include/log.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/avdtc_api.h b/system/stack/include/avdtc_api.h index 6948f83991..15e183e674 100644 --- a/system/stack/include/avdtc_api.h +++ b/system/stack/include/avdtc_api.h @@ -28,6 +28,7 @@ #define AVDT_CAPI_H #include "avdt_api.h" +#include "types/raw_address.h" /* start AVDTC events here to distinguish from AVDT events */ #define AVDTC_EVT_BEGIN 0x80 diff --git a/system/stack/include/avrc_api.h b/system/stack/include/avrc_api.h index 82b4a154a4..bcc9239977 100644 --- a/system/stack/include/avrc_api.h +++ b/system/stack/include/avrc_api.h @@ -31,6 +31,7 @@ #include "stack/include/avrc_defs.h" #include "stack/include/bt_hdr.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" /***************************************************************************** * constants diff --git a/system/stack/include/ble_acl_interface.h b/system/stack/include/ble_acl_interface.h index 5988064c7c..9c0554587b 100644 --- a/system/stack/include/ble_acl_interface.h +++ b/system/stack/include/ble_acl_interface.h @@ -18,6 +18,7 @@ #include "stack/include/bt_types.h" #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" void acl_ble_connection_complete(const tBLE_BD_ADDR& address_with_type, uint16_t handle, tHCI_ROLE role, bool match, diff --git a/system/stack/include/ble_advertiser.h b/system/stack/include/ble_advertiser.h index f4fc81c05d..1b753604d3 100644 --- a/system/stack/include/ble_advertiser.h +++ b/system/stack/include/ble_advertiser.h @@ -21,8 +21,11 @@ #include <base/bind.h> #include <base/memory/weak_ptr.h> + #include <vector> + #include "btm_ble_api.h" +#include "types/raw_address.h" #define BTM_BLE_MULTI_ADV_SUCCESS 0 #define BTM_BLE_MULTI_ADV_FAILURE 1 diff --git a/system/stack/include/ble_hci_link_interface.h b/system/stack/include/ble_hci_link_interface.h index 10b930e810..a078f587fe 100644 --- a/system/stack/include/ble_hci_link_interface.h +++ b/system/stack/include/ble_hci_link_interface.h @@ -18,6 +18,7 @@ #pragma once #include "osi/include/osi.h" // UNUSED_ATTR +#include "types/raw_address.h" // This header contains functions for HCI-ble to invoke void btm_ble_conn_complete(uint8_t* p, UNUSED_ATTR uint16_t evt_len, diff --git a/system/stack/include/bnep_api.h b/system/stack/include/bnep_api.h index c7ffed82ec..e6328f5023 100644 --- a/system/stack/include/bnep_api.h +++ b/system/stack/include/bnep_api.h @@ -27,6 +27,7 @@ #include "l2c_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/btm_api_types.h b/system/stack/include/btm_api_types.h index 2aa52480f0..817122b7bb 100644 --- a/system/stack/include/btm_api_types.h +++ b/system/stack/include/btm_api_types.h @@ -34,6 +34,7 @@ #include "stack/include/smp_api_types.h" #include "types/ble_address_with_type.h" #include "types/bt_transport.h" +#include "types/raw_address.h" /* Structure returned with Vendor Specific Command complete callback */ typedef struct { diff --git a/system/stack/include/btm_ble_api.h b/system/stack/include/btm_ble_api.h index e48670cbcb..a22b85a3e5 100644 --- a/system/stack/include/btm_ble_api.h +++ b/system/stack/include/btm_ble_api.h @@ -27,12 +27,15 @@ #include <base/callback_forward.h> #include <hardware/bt_common_types.h> + #include <memory> + #include "btm_api.h" #include "btm_ble_api_types.h" #include "osi/include/alarm.h" #include "stack/btm/neighbor_inquiry.h" #include "types/bt_transport.h" +#include "types/raw_address.h" void btm_ble_init(); void btm_ble_free(); diff --git a/system/stack/include/btm_ble_api_types.h b/system/stack/include/btm_ble_api_types.h index 2cd6a02cc7..3ecd775dde 100644 --- a/system/stack/include/btm_ble_api_types.h +++ b/system/stack/include/btm_ble_api_types.h @@ -21,6 +21,7 @@ #include <base/callback_forward.h> #include <hardware/bt_common_types.h> + #include <cstdint> #include <vector> @@ -28,6 +29,7 @@ #include "stack/include/btm_status.h" #include "stack/include/hci_error_code.h" #include "types/ble_address_with_type.h" +#include "types/raw_address.h" #define CHNL_MAP_LEN 5 typedef uint8_t tBTM_BLE_CHNL_MAP[CHNL_MAP_LEN]; diff --git a/system/stack/include/gap_api.h b/system/stack/include/gap_api.h index f59b0ba862..93b3be2498 100644 --- a/system/stack/include/gap_api.h +++ b/system/stack/include/gap_api.h @@ -24,6 +24,7 @@ #include "profiles_api.h" #include "stack/include/bt_hdr.h" #include "types/bt_transport.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/gatt_api.h b/system/stack/include/gatt_api.h index 5ac2f4cfab..a0e01b4c82 100644 --- a/system/stack/include/gatt_api.h +++ b/system/stack/include/gatt_api.h @@ -19,12 +19,14 @@ #define GATT_API_H #include <base/strings/stringprintf.h> + #include <string> #include "bt_target.h" #include "btm_ble_api.h" #include "gattdefs.h" #include "types/bt_transport.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h index 80d87b9b01..22f7b4acd4 100644 --- a/system/stack/include/hcimsgs.h +++ b/system/stack/include/hcimsgs.h @@ -25,6 +25,7 @@ #include "device/include/esco_parameters.h" #include "stack/include/bt_hdr.h" #include "types/ble_address_with_type.h" +#include "types/raw_address.h" void bte_main_hci_send(BT_HDR* p_msg, uint16_t event); diff --git a/system/stack/include/hidd_api.h b/system/stack/include/hidd_api.h index 696daa6eda..d3f311cb81 100644 --- a/system/stack/include/hidd_api.h +++ b/system/stack/include/hidd_api.h @@ -22,6 +22,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/hiddefs.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" /***************************************************************************** * Type Definitions diff --git a/system/stack/include/hidh_api.h b/system/stack/include/hidh_api.h index 00815483f9..b2d994258b 100644 --- a/system/stack/include/hidh_api.h +++ b/system/stack/include/hidh_api.h @@ -21,6 +21,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/hiddefs.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/l2c_api.h b/system/stack/include/l2c_api.h index 5961b10a25..6cdf1f35d2 100644 --- a/system/stack/include/l2c_api.h +++ b/system/stack/include/l2c_api.h @@ -34,6 +34,7 @@ #include "stack/include/bt_hdr.h" #include "types/bt_transport.h" #include "types/hci_role.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/l2cap_hci_link_interface.h b/system/stack/include/l2cap_hci_link_interface.h index 57223a0cf9..b67e8d7b0b 100644 --- a/system/stack/include/l2cap_hci_link_interface.h +++ b/system/stack/include/l2cap_hci_link_interface.h @@ -18,6 +18,7 @@ #pragma once #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" // This header contains functions for HCI-LinkManagement to invoke diff --git a/system/stack/include/l2cap_security_interface.h b/system/stack/include/l2cap_security_interface.h index 25c3d3c214..05fd1f714f 100644 --- a/system/stack/include/l2cap_security_interface.h +++ b/system/stack/include/l2cap_security_interface.h @@ -16,6 +16,7 @@ */ #pragma once +#include "types/raw_address.h" // This header contains functions for Security Module to invoke diff --git a/system/stack/include/pan_api.h b/system/stack/include/pan_api.h index 51d45a67c4..e7774f7801 100644 --- a/system/stack/include/pan_api.h +++ b/system/stack/include/pan_api.h @@ -26,6 +26,7 @@ #include "bnep_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/port_api.h b/system/stack/include/port_api.h index e331a3d19d..bd1002a806 100644 --- a/system/stack/include/port_api.h +++ b/system/stack/include/port_api.h @@ -25,6 +25,7 @@ #define PORT_API_H #include "bt_target.h" +#include "types/raw_address.h" /***************************************************************************** * Constants and Types diff --git a/system/stack/include/sdp_api.h b/system/stack/include/sdp_api.h index 34579d7291..cc6772cbf1 100644 --- a/system/stack/include/sdp_api.h +++ b/system/stack/include/sdp_api.h @@ -20,6 +20,8 @@ #include "bt_target.h" #include "sdpdefs.h" +#include "types/bluetooth/uuid.h" +#include "types/raw_address.h" /***************************************************************************** * Constants diff --git a/system/stack/include/security_client_callbacks.h b/system/stack/include/security_client_callbacks.h index 04c5d2aac2..a056c4f2b4 100644 --- a/system/stack/include/security_client_callbacks.h +++ b/system/stack/include/security_client_callbacks.h @@ -19,6 +19,7 @@ #include "stack/include/btm_api_types.h" #include "stack/include/btm_ble_api_types.h" #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" /**************************************** * Security Manager Callback Functions diff --git a/system/stack/include/smp_api.h b/system/stack/include/smp_api.h index 9787bd8565..f0d412be5f 100644 --- a/system/stack/include/smp_api.h +++ b/system/stack/include/smp_api.h @@ -27,6 +27,7 @@ #include "bt_target.h" #include "smp_api_types.h" #include "types/bt_transport.h" +#include "types/raw_address.h" /***************************************************************************** * External Function Declarations diff --git a/system/stack/include/smp_api_types.h b/system/stack/include/smp_api_types.h index 04cd7c5685..2a133fbaac 100644 --- a/system/stack/include/smp_api_types.h +++ b/system/stack/include/smp_api_types.h @@ -20,9 +20,9 @@ #define SMP_API_TYPES_H #include "bt_target.h" // Must be first to define build configuration - #include "stack/include/btm_status.h" #include "types/ble_address_with_type.h" +#include "types/raw_address.h" /* SMP command code */ typedef enum : uint8_t { diff --git a/system/stack/include/srvc_api.h b/system/stack/include/srvc_api.h index dad6909bb5..9273d5fa17 100644 --- a/system/stack/include/srvc_api.h +++ b/system/stack/include/srvc_api.h @@ -23,6 +23,7 @@ #include "gatt_api.h" #include "gattdefs.h" #include "types/bt_transport.h" +#include "types/raw_address.h" #define DIS_SUCCESS GATT_SUCCESS #define DIS_ILLEGAL_PARAM GATT_ILLEGAL_PARAMETER diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc index 7155d12e04..b0d7d330a9 100644 --- a/system/stack/l2cap/l2c_api.cc +++ b/system/stack/l2cap/l2c_api.cc @@ -40,6 +40,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/l2c_api.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" void btsnd_hcic_enhanced_flush(uint16_t handle, uint8_t packet_type); // TODO Remove diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc index 5b7ac1a72d..98924893d2 100644 --- a/system/stack/l2cap/l2c_ble.cc +++ b/system/stack/l2cap/l2c_ble.cc @@ -42,6 +42,7 @@ #include "stack/btm/btm_sec.h" #include "stack/include/acl_api.h" #include "stack_config.h" +#include "types/raw_address.h" tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, uint16_t psm, bool is_originator, diff --git a/system/stack/l2cap/l2c_int.h b/system/stack/l2cap/l2c_int.h index 31ae0cb1e7..093ba64157 100644 --- a/system/stack/l2cap/l2c_int.h +++ b/system/stack/l2cap/l2c_int.h @@ -42,6 +42,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/hci_error_code.h" #include "types/hci_role.h" +#include "types/raw_address.h" #define L2CAP_MIN_MTU 48 /* Minimum acceptable MTU is 48 bytes */ diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc index 580f307120..460669e68b 100644 --- a/system/stack/l2cap/l2c_utils.cc +++ b/system/stack/l2cap/l2c_utils.cc @@ -39,6 +39,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/hci_error_code.h" +#include "types/raw_address.h" tL2C_CCB* l2cu_get_next_channel_in_rr(tL2C_LCB* p_lcb); // TODO Move diff --git a/system/stack/pan/pan_api.cc b/system/stack/pan/pan_api.cc index 70036ff738..4f95bd69f5 100644 --- a/system/stack/pan/pan_api.cc +++ b/system/stack/pan/pan_api.cc @@ -36,6 +36,7 @@ #include "stack/include/sdp_api.h" #include "stack/include/sdpdefs.h" #include "stack/pan/pan_int.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/pan/pan_main.cc b/system/stack/pan/pan_main.cc index 39077005e1..80dda7b52b 100644 --- a/system/stack/pan/pan_main.cc +++ b/system/stack/pan/pan_main.cc @@ -33,6 +33,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/sdpdefs.h" #include "stack/pan/pan_int.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/rfcomm/rfc_int.h b/system/stack/rfcomm/rfc_int.h index 0ee1f16bb9..9b9c96b5a8 100644 --- a/system/stack/rfcomm/rfc_int.h +++ b/system/stack/rfcomm/rfc_int.h @@ -34,6 +34,7 @@ #include "stack/include/l2c_api.h" #include "stack/rfcomm/port_int.h" #include "stack/rfcomm/rfc_event.h" +#include "types/raw_address.h" /* * Define RFCOMM result codes diff --git a/system/stack/rfcomm/rfc_utils.cc b/system/stack/rfcomm/rfc_utils.cc index f9d38d2e35..67139005ca 100644 --- a/system/stack/rfcomm/rfc_utils.cc +++ b/system/stack/rfcomm/rfc_utils.cc @@ -30,6 +30,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/port_ext.h" #include "stack/rfcomm/rfc_int.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/stack/sdp/sdp_discovery.cc b/system/stack/sdp/sdp_discovery.cc index 4db89b466f..ad6c173a48 100644 --- a/system/stack/sdp/sdp_discovery.cc +++ b/system/stack/sdp/sdp_discovery.cc @@ -35,6 +35,7 @@ #include "stack/include/sdpdefs.h" #include "stack/sdp/sdpint.h" #include "types/bluetooth/uuid.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/stack/smp/smp_api.cc b/system/stack/smp/smp_api.cc index ba5d45033b..c183965825 100644 --- a/system/stack/smp/smp_api.cc +++ b/system/stack/smp/smp_api.cc @@ -22,23 +22,23 @@ * applications that can run over an SMP. * ******************************************************************************/ +#include "smp_api.h" + #include <base/logging.h> #include <string.h> #include "bt_target.h" #include "bt_utils.h" -#include "stack_config.h" - #include "gd/os/log.h" #include "gd/os/rand.h" #include "l2c_api.h" #include "l2cdefs.h" #include "main/shim/shim.h" -#include "smp_api.h" +#include "p_256_ecc_pp.h" #include "smp_int.h" #include "stack/btm/btm_dev.h" - -#include "p_256_ecc_pp.h" +#include "stack_config.h" +#include "types/raw_address.h" /******************************************************************************* * diff --git a/system/stack/smp/smp_int.h b/system/stack/smp/smp_int.h index dfc87e00ca..0690ea16c4 100644 --- a/system/stack/smp/smp_int.h +++ b/system/stack/smp/smp_int.h @@ -29,6 +29,7 @@ #include "smp_api.h" #include "stack/crypto_toolbox/crypto_toolbox.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" typedef enum : uint8_t { /* Legacy mode */ diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc index f15063d5f9..c545ef7281 100644 --- a/system/stack/smp/smp_keys.cc +++ b/system/stack/smp/smp_keys.cc @@ -39,6 +39,7 @@ #include "stack/btm/btm_sec.h" #include "stack/crypto_toolbox/crypto_toolbox.h" #include "stack/include/acl_api.h" +#include "types/raw_address.h" extern tBTM_CB btm_cb; // TODO Remove diff --git a/system/stack/smp/smp_l2c.cc b/system/stack/smp/smp_l2c.cc index 8ed221a8f3..7552aacc80 100644 --- a/system/stack/smp/smp_l2c.cc +++ b/system/stack/smp/smp_l2c.cc @@ -36,6 +36,7 @@ #include "osi/include/osi.h" // UNUSED_ATTR #include "smp_int.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr, bool connected, uint16_t reason, diff --git a/system/stack/smp/smp_utils.cc b/system/stack/smp/smp_utils.cc index 918d8b8203..8ac0124c4e 100644 --- a/system/stack/smp/smp_utils.cc +++ b/system/stack/smp/smp_utils.cc @@ -36,6 +36,7 @@ #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "stack/include/stack_metrics_logging.h" +#include "types/raw_address.h" #define SMP_PAIRING_REQ_SIZE 7 #define SMP_CONFIRM_CMD_SIZE (OCTET16_LEN + 1) diff --git a/system/stack/srvc/srvc_dis.cc b/system/stack/srvc/srvc_dis.cc index ae3d0f4542..f23dcfa137 100644 --- a/system/stack/srvc/srvc_dis.cc +++ b/system/stack/srvc/srvc_dis.cc @@ -27,6 +27,7 @@ #include "osi/include/osi.h" #include "srvc_dis_int.h" #include "srvc_eng_int.h" +#include "types/raw_address.h" using base::StringPrintf; #define DIS_MAX_NUM_INC_SVR 0 diff --git a/system/stack/srvc/srvc_eng.cc b/system/stack/srvc/srvc_eng.cc index 8941f5cad1..a67ec453d0 100644 --- a/system/stack/srvc/srvc_eng.cc +++ b/system/stack/srvc/srvc_eng.cc @@ -22,9 +22,9 @@ #include "gatt_int.h" #include "osi/include/allocator.h" #include "osi/include/osi.h" -#include "srvc_eng_int.h" - #include "srvc_dis_int.h" +#include "srvc_eng_int.h" +#include "types/raw_address.h" using base::StringPrintf; static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id, diff --git a/system/stack/srvc/srvc_eng_int.h b/system/stack/srvc/srvc_eng_int.h index 63f1e471bf..b8cc79eb59 100644 --- a/system/stack/srvc/srvc_eng_int.h +++ b/system/stack/srvc/srvc_eng_int.h @@ -22,6 +22,7 @@ #include "bt_target.h" #include "gatt_api.h" #include "srvc_api.h" +#include "types/raw_address.h" #define SRVC_MAX_APPS GATT_CL_MAX_LCB diff --git a/system/stack/test/ble_advertiser_test.cc b/system/stack/test/ble_advertiser_test.cc index 8ed868f251..d7b4f8790c 100644 --- a/system/stack/test/ble_advertiser_test.cc +++ b/system/stack/test/ble_advertiser_test.cc @@ -16,13 +16,16 @@ * ******************************************************************************/ -#include <array> +#include "stack/include/ble_advertiser.h" + #include <gmock/gmock.h> #include <gtest/gtest.h> +#include <array> + #include "device/include/controller.h" #include "stack/btm/ble_advertiser_hci_interface.h" -#include "stack/include/ble_advertiser.h" +#include "types/raw_address.h" using ::testing::Args; using ::testing::Contains; diff --git a/system/stack/test/common/mock_btm_api_layer.h b/system/stack/test/common/mock_btm_api_layer.h index 0d7ee14c54..052babbafd 100644 --- a/system/stack/test/common/mock_btm_api_layer.h +++ b/system/stack/test/common/mock_btm_api_layer.h @@ -19,6 +19,7 @@ #include <gmock/gmock.h> #include "btm_api.h" +#include "types/raw_address.h" namespace bluetooth { namespace manager { @@ -52,4 +53,4 @@ class MockBtmApiInterface : public BtmApiInterface { void SetMockBtmApiInterface(MockBtmApiInterface* mock_btm_interface); } // namespace manager -} // namespace bluetooth
\ No newline at end of file +} // namespace bluetooth diff --git a/system/stack/test/common/mock_btm_layer.cc b/system/stack/test/common/mock_btm_layer.cc index 7c3ae2ea03..d0fb04e039 100644 --- a/system/stack/test/common/mock_btm_layer.cc +++ b/system/stack/test/common/mock_btm_layer.cc @@ -17,8 +17,10 @@ ******************************************************************************/ #include "mock_btm_layer.h" + #include "stack/include/btm_client_interface.h" #include "stack/include/rfcdefs.h" +#include "types/raw_address.h" static bluetooth::manager::MockBtmSecurityInternalInterface* btm_security_internal_interface = nullptr; diff --git a/system/stack/test/common/mock_eatt.cc b/system/stack/test/common/mock_eatt.cc index c0cfc24136..560531a657 100644 --- a/system/stack/test/common/mock_eatt.cc +++ b/system/stack/test/common/mock_eatt.cc @@ -17,6 +17,8 @@ #include "mock_eatt.h" +#include "types/raw_address.h" + MockEattExtension* mock_pimpl_; MockEattExtension* MockEattExtension::GetInstance() { bluetooth::eatt::EattExtension::GetInstance(); diff --git a/system/stack/test/common/mock_eatt.h b/system/stack/test/common/mock_eatt.h index 9875c7bb45..8b5d9d58ca 100644 --- a/system/stack/test/common/mock_eatt.h +++ b/system/stack/test/common/mock_eatt.h @@ -19,6 +19,7 @@ #include <gmock/gmock.h> #include "stack/eatt/eatt.h" +#include "types/raw_address.h" using bluetooth::eatt::EattChannel; using bluetooth::eatt::EattExtension; diff --git a/system/stack/test/common/mock_gatt_layer.cc b/system/stack/test/common/mock_gatt_layer.cc index a941066958..4df76281ec 100644 --- a/system/stack/test/common/mock_gatt_layer.cc +++ b/system/stack/test/common/mock_gatt_layer.cc @@ -17,6 +17,8 @@ #include "mock_gatt_layer.h" +#include "types/raw_address.h" + static bluetooth::gatt::MockGattInterface* gatt_interface = nullptr; void bluetooth::gatt::SetMockGattInterface( diff --git a/system/stack/test/common/mock_gatt_layer.h b/system/stack/test/common/mock_gatt_layer.h index c61ef4af52..2bfffa174c 100644 --- a/system/stack/test/common/mock_gatt_layer.h +++ b/system/stack/test/common/mock_gatt_layer.h @@ -20,6 +20,7 @@ #include "bind_helpers.h" #include "stack/gatt/gatt_int.h" +#include "types/raw_address.h" namespace bluetooth { namespace gatt { diff --git a/system/stack/test/common/mock_l2cap_layer.cc b/system/stack/test/common/mock_l2cap_layer.cc index d4f11eb611..2892759038 100644 --- a/system/stack/test/common/mock_l2cap_layer.cc +++ b/system/stack/test/common/mock_l2cap_layer.cc @@ -18,6 +18,7 @@ #include "mock_l2cap_layer.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" static bluetooth::l2cap::MockL2capInterface* l2cap_interface = nullptr; diff --git a/system/stack/test/common/mock_l2cap_layer.h b/system/stack/test/common/mock_l2cap_layer.h index c4db7dad68..edb662be22 100644 --- a/system/stack/test/common/mock_l2cap_layer.h +++ b/system/stack/test/common/mock_l2cap_layer.h @@ -21,6 +21,7 @@ #include "l2c_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" namespace bluetooth { namespace l2cap { diff --git a/system/stack/test/eatt/eatt_test.cc b/system/stack/test/eatt/eatt_test.cc index 4fb35ba45e..1bdca362e1 100644 --- a/system/stack/test/eatt/eatt_test.cc +++ b/system/stack/test/eatt/eatt_test.cc @@ -30,6 +30,7 @@ #include "mock_gatt_layer.h" #include "mock_l2cap_layer.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" using testing::_; using testing::DoAll; diff --git a/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h b/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h index 62d4a789bc..1224292482 100644 --- a/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h +++ b/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h @@ -21,11 +21,14 @@ // It is included by the corresponding "...Functions.h" file. #include <fuzzer/FuzzedDataProvider.h> + #include <vector> + #include "bt_target.h" #include "fuzzers/sdp/sdpFuzzHelpers.h" #include "osi/include/allocator.h" #include "stack/a2dp/a2dp_int.h" +#include "types/raw_address.h" #define MAX_DB_SIZE 4096 diff --git a/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h b/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h index 7040c6b01b..833c011f94 100644 --- a/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h +++ b/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h @@ -18,10 +18,13 @@ #define FUZZER_SDP_FUNCTIONS_H_ #include <fuzzer/FuzzedDataProvider.h> + #include <vector> + #include "fuzzers/common/commonFuzzHelpers.h" #include "fuzzers/sdp/sdpFuzzHelpers.h" #include "stack/include/sdp_api.h" +#include "types/raw_address.h" #define SDP_MAX_DB_LEN 1024 * 1024 // 1 MB #define MAX_NUM_DBS 64 diff --git a/system/stack/test/fuzzers/sdp/sdpFuzzHelpers.h b/system/stack/test/fuzzers/sdp/sdpFuzzHelpers.h index bae17854cb..1bebb657cc 100644 --- a/system/stack/test/fuzzers/sdp/sdpFuzzHelpers.h +++ b/system/stack/test/fuzzers/sdp/sdpFuzzHelpers.h @@ -21,11 +21,14 @@ // It is included by the corresponding "...Functions.h" file. #include <fuzzer/FuzzedDataProvider.h> + #include <algorithm> #include <vector> + #include "fuzzers/common/commonFuzzHelpers.h" #include "osi/include/alarm.h" #include "stack/sdp/sdpint.h" +#include "types/raw_address.h" #define SDP_MAX_NUM_ELEMS 128 #define SDP_MAX_ELEM_LEN 1024 diff --git a/system/stack/test/gatt/mock_gatt_utils_ref.cc b/system/stack/test/gatt/mock_gatt_utils_ref.cc index 9063328e5c..b452e36507 100644 --- a/system/stack/test/gatt/mock_gatt_utils_ref.cc +++ b/system/stack/test/gatt/mock_gatt_utils_ref.cc @@ -17,6 +17,7 @@ #include "common/message_loop_thread.h" #include "stack/gatt/gatt_int.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #include "utils/include/bt_utils.h" /** stack/btu/btu_task.cc, indirect reference, gatt_utils.cc -> libosi */ diff --git a/system/stack/test/gatt/stack_gatt_test.cc b/system/stack/test/gatt/stack_gatt_test.cc index 4c58ea86f2..36f6f469d4 100644 --- a/system/stack/test/gatt/stack_gatt_test.cc +++ b/system/stack/test/gatt/stack_gatt_test.cc @@ -26,6 +26,7 @@ #include "common/strings.h" #include "stack/gatt/gatt_int.h" #include "stack/include/gatt_api.h" +#include "types/raw_address.h" std::map<std::string, int> mock_function_count_map; diff --git a/system/stack/test/rfcomm/stack_rfcomm_test.cc b/system/stack/test/rfcomm/stack_rfcomm_test.cc index 262548c438..8501674619 100644 --- a/system/stack/test/rfcomm/stack_rfcomm_test.cc +++ b/system/stack/test/rfcomm/stack_rfcomm_test.cc @@ -32,6 +32,7 @@ #include "stack/rfcomm/rfc_int.h" #include "stack_rfcomm_test_utils.h" #include "stack_test_packet_utils.h" +#include "types/raw_address.h" std::string DumpByteBufferToString(uint8_t* p_data, size_t len) { std::stringstream str; diff --git a/system/stack/test/stack_avdtp_test.cc b/system/stack/test/stack_avdtp_test.cc index e6621bef80..53950a2412 100644 --- a/system/stack/test/stack_avdtp_test.cc +++ b/system/stack/test/stack_avdtp_test.cc @@ -17,9 +17,10 @@ //#include <dlfcn.h> #include <gtest/gtest.h> -#include "stack/include/avdt_api.h" #include "stack/avdt/avdt_int.h" +#include "stack/include/avdt_api.h" #include "stack/test/common/mock_stack_avdt_msg.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/stack/test/stack_smp_test.cc b/system/stack/test/stack_smp_test.cc index db00c15fdc..771b2d9681 100644 --- a/system/stack/test/stack_smp_test.cc +++ b/system/stack/test/stack_smp_test.cc @@ -31,6 +31,7 @@ #include "stack/smp/smp_int.h" #include "test/mock/mock_stack_acl.h" #include "types/hci_role.h" +#include "types/raw_address.h" tBTM_CB btm_cb; std::map<std::string, int> mock_function_count_map; diff --git a/system/test/headless/get_options.cc b/system/test/headless/get_options.cc index 56ca1f939a..7c9cc1ce54 100644 --- a/system/test/headless/get_options.cc +++ b/system/test/headless/get_options.cc @@ -20,9 +20,12 @@ #include <getopt.h> #include <stdio.h> #include <unistd.h> + #include <list> #include <string> + #include "gd/os/log.h" +#include "types/raw_address.h" namespace { enum OptionType { diff --git a/system/test/headless/headless.cc b/system/test/headless/headless.cc index b4c7753765..ee86f4af2d 100644 --- a/system/test/headless/headless.cc +++ b/system/test/headless/headless.cc @@ -16,7 +16,10 @@ #define LOG_TAG "bt_headless" +#include "test/headless/headless.h" + #include <dlfcn.h> // dlopen + #include <algorithm> #include <iostream> #include <map> @@ -25,8 +28,8 @@ #include "include/hardware/bluetooth.h" #include "osi/include/log.h" // android log only #include "test/headless/get_options.h" -#include "test/headless/headless.h" #include "test/headless/interface.h" +#include "types/raw_address.h" extern bt_interface_t bluetoothInterface; diff --git a/system/test/headless/interface.h b/system/test/headless/interface.h index d79016a7fc..468e5622c4 100644 --- a/system/test/headless/interface.h +++ b/system/test/headless/interface.h @@ -7,6 +7,7 @@ #include <string> #include "include/hardware/bluetooth.h" +#include "types/raw_address.h" using acl_state_changed_params_t = struct { bt_status_t status; diff --git a/system/test/mock/mock_a2dp_api.cc b/system/test/mock/mock_a2dp_api.cc index 1a645beadb..ccd5f0a1b4 100644 --- a/system/test/mock/mock_a2dp_api.cc +++ b/system/test/mock/mock_a2dp_api.cc @@ -25,12 +25,14 @@ extern std::map<std::string, int> mock_function_count_map; #include <string.h> + #include "a2dp_api.h" #include "a2dp_int.h" #include "avdt_api.h" #include "bt_target.h" #include "osi/include/log.h" #include "sdpdefs.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_ag_api.cc b/system/test/mock/mock_bta_ag_api.cc index 09909d9a26..bb1ea300f3 100644 --- a/system/test/mock/mock_bta_ag_api.cc +++ b/system/test/mock/mock_bta_ag_api.cc @@ -26,11 +26,14 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/bind.h> #include <base/location.h> + #include <cstdint> #include <cstring> #include <vector> + #include "bta/ag/bta_ag_int.h" #include "bta/include/bta_ag_api.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_ar.cc b/system/test/mock/mock_bta_ar.cc index 1b9932c363..a9f74c1e35 100644 --- a/system/test/mock/mock_bta_ar.cc +++ b/system/test/mock/mock_bta_ar.cc @@ -25,10 +25,12 @@ extern std::map<std::string, int> mock_function_count_map; #include <cstdint> + #include "bta/ar/bta_ar_int.h" #include "bta/sys/bta_sys.h" #include "stack/include/avct_api.h" #include "stack/include/avrc_api.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_av_api.cc b/system/test/mock/mock_bta_av_api.cc index 5b197665d1..4c4e93d3c0 100644 --- a/system/test/mock/mock_bta_av_api.cc +++ b/system/test/mock/mock_bta_av_api.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "osi/include/compat.h" #include "osi/include/log.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_av_main.cc b/system/test/mock/mock_bta_av_main.cc index 7abf8f628b..cb1c8b31a7 100644 --- a/system/test/mock/mock_bta_av_main.cc +++ b/system/test/mock/mock_bta_av_main.cc @@ -40,6 +40,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" #include "types/hci_role.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_dm_act.cc b/system/test/mock/mock_bta_dm_act.cc index 5fc668781b..67030ccf5a 100644 --- a/system/test/mock/mock_bta_dm_act.cc +++ b/system/test/mock/mock_bta_dm_act.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_bta_dm_act.h" +#include "types/raw_address.h" // Mocked internal structures, if any diff --git a/system/test/mock/mock_bta_dm_api.cc b/system/test/mock/mock_bta_dm_api.cc index 1d5720b7d9..56d0ece3b5 100644 --- a/system/test/mock/mock_bta_dm_api.cc +++ b/system/test/mock/mock_bta_dm_api.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_bta_dm_api.h" +#include "types/raw_address.h" // Mocked internal structures, if any diff --git a/system/test/mock/mock_bta_gattc_api.cc b/system/test/mock/mock_bta_gattc_api.cc index 6b39e360d8..c583042919 100644 --- a/system/test/mock/mock_bta_gattc_api.cc +++ b/system/test/mock/mock_bta_gattc_api.cc @@ -27,15 +27,18 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/bind.h> + #include <ios> #include <list> #include <memory> #include <vector> + #include "bt_target.h" #include "bta/gatt/bta_gattc_int.h" #include "device/include/controller.h" #include "types/bluetooth/uuid.h" #include "types/bt_transport.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_hd_api.cc b/system/test/mock/mock_bta_hd_api.cc index a8022450c2..a4902053d5 100644 --- a/system/test/mock/mock_bta_hd_api.cc +++ b/system/test/mock/mock_bta_hd_api.cc @@ -29,6 +29,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/log.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_hh_utils.cc b/system/test/mock/mock_bta_hh_utils.cc index 2f77f71efa..0980dd31cd 100644 --- a/system/test/mock/mock_bta_hh_utils.cc +++ b/system/test/mock/mock_bta_hh_utils.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_bta_hh_utils.h" +#include "types/raw_address.h" // Mocked internal structures, if any diff --git a/system/test/mock/mock_bta_pan_api.cc b/system/test/mock/mock_bta_pan_api.cc index adc1462c3d..7d3de37d5e 100644 --- a/system/test/mock/mock_bta_pan_api.cc +++ b/system/test/mock/mock_bta_pan_api.cc @@ -32,6 +32,7 @@ extern std::map<std::string, int> mock_function_count_map; #endif #include "bta/pan/bta_pan_int.h" +#include "types/raw_address.h" void BTA_PanClose(uint16_t handle) { mock_function_count_map[__func__]++; } void BTA_PanDisable(void) { mock_function_count_map[__func__]++; } diff --git a/system/test/mock/mock_bta_sdp_api.cc b/system/test/mock/mock_bta_sdp_api.cc index 4dbb79f8bd..b1a3f061a0 100644 --- a/system/test/mock/mock_bta_sdp_api.cc +++ b/system/test/mock/mock_bta_sdp_api.cc @@ -26,9 +26,11 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/bind.h> #include <base/location.h> + #include "bt_target.h" #include "bta/include/bta_sdp_api.h" #include "bta/sdp/bta_sdp_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_bta_vc.cc b/system/test/mock/mock_bta_vc.cc index b47f5497b6..309e62faf9 100644 --- a/system/test/mock/mock_bta_vc.cc +++ b/system/test/mock/mock_bta_vc.cc @@ -28,13 +28,16 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/logging.h> #include <base/strings/string_number_conversions.h> #include <hardware/bt_vc.h> + #include <string> #include <vector> + #include "bind_helpers.h" #include "bta/include/bta_gatt_api.h" #include "bta/include/bta_gatt_queue.h" #include "bta/include/bta_vc_api.h" #include "btif/include/btif_storage.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_btif_bluetooth.cc b/system/test/mock/mock_btif_bluetooth.cc index affad0903b..1ea1faf3a4 100644 --- a/system/test/mock/mock_btif_bluetooth.cc +++ b/system/test/mock/mock_btif_bluetooth.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_btif_bluetooth.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_btif_bluetooth.h b/system/test/mock/mock_btif_bluetooth.h index 42a545214c..330fcbe434 100644 --- a/system/test/mock/mock_btif_bluetooth.h +++ b/system/test/mock/mock_btif_bluetooth.h @@ -85,6 +85,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "osi/include/wakelock.h" #include "stack/gatt/connection_manager.h" #include "stack/include/avdt_api.h" +#include "types/raw_address.h" #include "utils/include/bt_utils.h" // Mocked compile conditionals, if any diff --git a/system/test/mock/mock_btif_co_bta_hh_co.cc b/system/test/mock/mock_btif_co_bta_hh_co.cc index 83782555b3..74b1c2e618 100644 --- a/system/test/mock/mock_btif_co_bta_hh_co.cc +++ b/system/test/mock/mock_btif_co_bta_hh_co.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "bta/include/bta_hh_api.h" #include "bta/include/bta_hh_co.h" #include "btif/include/btif_hh.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_btif_config.cc b/system/test/mock/mock_btif_config.cc index 512a01f1d8..9a486ad29d 100644 --- a/system/test/mock/mock_btif_config.cc +++ b/system/test/mock/mock_btif_config.cc @@ -37,6 +37,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_btif_config.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_btif_core.cc b/system/test/mock/mock_btif_core.cc index 7d484727ca..65a0c2c77e 100644 --- a/system/test/mock/mock_btif_core.cc +++ b/system/test/mock/mock_btif_core.cc @@ -29,7 +29,9 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/threading/platform_thread.h> #include <signal.h> #include <sys/types.h> + #include <cstdint> + #include "bt_target.h" #include "btif/include/btif_av.h" #include "btif/include/btif_common.h" @@ -49,6 +51,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/btm_api.h" #include "stack/include/btm_ble_api.h" #include "types/bluetooth/uuid.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_common_address_obfuscator.cc b/system/test/mock/mock_common_address_obfuscator.cc index 054911b5f7..f32ce96467 100644 --- a/system/test/mock/mock_common_address_obfuscator.cc +++ b/system/test/mock/mock_common_address_obfuscator.cc @@ -26,8 +26,11 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/logging.h> #include <openssl/hmac.h> + #include <algorithm> + #include "common/address_obfuscator.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_common_metric_id_allocator.cc b/system/test/mock/mock_common_metric_id_allocator.cc index c374db1f46..7689a83942 100644 --- a/system/test/mock/mock_common_metric_id_allocator.cc +++ b/system/test/mock/mock_common_metric_id_allocator.cc @@ -25,10 +25,13 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/logging.h> + #include <functional> #include <mutex> #include <thread> + #include "common/metric_id_allocator.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_common_metrics.cc b/system/test/mock/mock_common_metrics.cc index 01612fb8ba..ce8a7fb686 100644 --- a/system/test/mock/mock_common_metrics.cc +++ b/system/test/mock/mock_common_metrics.cc @@ -25,6 +25,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "common/metrics.h" +#include "types/raw_address.h" #if 0 #include <base/base64.h> diff --git a/system/test/mock/mock_device_controller.cc b/system/test/mock/mock_device_controller.cc index e4dddc4c56..fbee19a5ca 100644 --- a/system/test/mock/mock_device_controller.cc +++ b/system/test/mock/mock_device_controller.cc @@ -33,6 +33,7 @@ extern std::map<std::string, int> mock_function_count_map; // for this effort. This compilation unit may compile as-is, or // may need attention to prune the inclusion set. #include "main/shim/controller.h" +#include "types/raw_address.h" // Mock include file to share data between tests and mock #include "test/mock/mock_device_controller.h" diff --git a/system/test/mock/mock_hcic_hciblecmds.cc b/system/test/mock/mock_hcic_hciblecmds.cc index 19419ad393..e63f723c36 100644 --- a/system/test/mock/mock_hcic_hciblecmds.cc +++ b/system/test/mock/mock_hcic_hciblecmds.cc @@ -32,6 +32,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "bt_target.h" #include "btu.h" #include "hcimsgs.h" +#include "types/raw_address.h" void btsnd_hci_ble_add_device_to_periodic_advertiser_list( uint8_t adv_addr_type, const RawAddress& adv_addr, uint8_t adv_sid, base::OnceCallback<void(uint8_t*, uint16_t)> cb) { diff --git a/system/test/mock/mock_main_shim_l2cap_api.h b/system/test/mock/mock_main_shim_l2cap_api.h index 12e308bb6e..1d8d37c74a 100644 --- a/system/test/mock/mock_main_shim_l2cap_api.h +++ b/system/test/mock/mock_main_shim_l2cap_api.h @@ -54,6 +54,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/btm_api.h" #include "stack/include/gatt_api.h" #include "stack/include/sco_hci_link_interface.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_a2dp_api.cc b/system/test/mock/mock_stack_a2dp_api.cc index 5362776186..97c2206dfc 100644 --- a/system/test/mock/mock_stack_a2dp_api.cc +++ b/system/test/mock/mock_stack_a2dp_api.cc @@ -25,12 +25,14 @@ extern std::map<std::string, int> mock_function_count_map; #include <string.h> + #include "a2dp_api.h" #include "avdt_api.h" #include "bt_target.h" #include "osi/include/log.h" #include "sdpdefs.h" #include "stack/a2dp/a2dp_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_acl.cc b/system/test/mock/mock_stack_acl.cc index 8edcf5cab6..1501482688 100644 --- a/system/test/mock/mock_stack_acl.cc +++ b/system/test/mock/mock_stack_acl.cc @@ -31,6 +31,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "stack/include/bt_hdr.h" #include "test/mock/mock_stack_acl.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_acl_ble.cc b/system/test/mock/mock_stack_acl_ble.cc index 903832fc6a..413b2ba02f 100644 --- a/system/test/mock/mock_stack_acl_ble.cc +++ b/system/test/mock/mock_stack_acl_ble.cc @@ -25,6 +25,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <cstdint> + #include "osi/include/log.h" #include "stack/btm/btm_ble_int.h" #include "stack/btm/btm_dev.h" @@ -34,6 +35,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/l2cap_hci_link_interface.h" #include "types/ble_address_with_type.h" #include "types/hci_role.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc b/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc index 465a3fe13c..061920d710 100644 --- a/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc +++ b/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc @@ -36,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_acl_btm_ble_connection_establishment.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_avct_api.cc b/system/test/mock/mock_stack_avct_api.cc index 9ec3e87613..327918aa33 100644 --- a/system/test/mock/mock_stack_avct_api.cc +++ b/system/test/mock/mock_stack_avct_api.cc @@ -36,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/avct/avct_int.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_avdt_api.cc b/system/test/mock/mock_stack_avdt_api.cc index b5112badf7..6fa2bf1081 100644 --- a/system/test/mock/mock_stack_avdt_api.cc +++ b/system/test/mock/mock_stack_avdt_api.cc @@ -38,6 +38,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/btm/btm_sec.h" #include "stack/include/a2dp_codec_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_avrc_api.cc b/system/test/mock/mock_stack_avrc_api.cc index 3557bfbbcd..4d86f4a954 100644 --- a/system/test/mock/mock_stack_avrc_api.cc +++ b/system/test/mock/mock_stack_avrc_api.cc @@ -34,6 +34,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/avrc/avrc_int.h" #include "stack/include/avrc_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_avrc_sdp.cc b/system/test/mock/mock_stack_avrc_sdp.cc index cab7a341d1..630250b549 100644 --- a/system/test/mock/mock_stack_avrc_sdp.cc +++ b/system/test/mock/mock_stack_avrc_sdp.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/avrc/avrc_int.h" #include "stack/include/avrc_api.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_bnep_api.cc b/system/test/mock/mock_stack_bnep_api.cc index 576434c1b6..580010f11a 100644 --- a/system/test/mock/mock_stack_bnep_api.cc +++ b/system/test/mock/mock_stack_bnep_api.cc @@ -31,6 +31,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/btm/btm_sec.h" #include "stack/include/bnep_api.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_ble_addr.cc b/system/test/mock/mock_stack_btm_ble_addr.cc index 7db849800f..157ebe8fb7 100644 --- a/system/test/mock/mock_stack_btm_ble_addr.cc +++ b/system/test/mock/mock_stack_btm_ble_addr.cc @@ -35,6 +35,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_btm_ble_addr.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_ble_bgconn.cc b/system/test/mock/mock_stack_btm_ble_bgconn.cc index 0772b2b091..f98b6146e2 100644 --- a/system/test/mock/mock_stack_btm_ble_bgconn.cc +++ b/system/test/mock/mock_stack_btm_ble_bgconn.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_btm_ble_bgconn.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_dev.cc b/system/test/mock/mock_stack_btm_dev.cc index 632a944bc1..58d66683f4 100644 --- a/system/test/mock/mock_stack_btm_dev.cc +++ b/system/test/mock/mock_stack_btm_dev.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "btm_api.h" #include "device/include/controller.h" #include "l2c_api.h" @@ -35,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "main/shim/shim.h" #include "stack/btm/btm_dev.h" #include "stack/include/acl_api.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_devctl.cc b/system/test/mock/mock_stack_btm_devctl.cc index e4d341e026..78d732a859 100644 --- a/system/test/mock/mock_stack_btm_devctl.cc +++ b/system/test/mock/mock_stack_btm_devctl.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <stddef.h> #include <stdlib.h> #include <string.h> + #include "bta/dm/bta_dm_int.h" #include "bta/sys/bta_sys.h" #include "btcore/include/module.h" @@ -43,6 +44,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/gatt/connection_manager.h" #include "stack/include/acl_api.h" #include "stack/include/l2cap_controller_interface.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_inq.cc b/system/test/mock/mock_stack_btm_inq.cc index d11beb091b..70cecba97b 100644 --- a/system/test/mock/mock_stack_btm_inq.cc +++ b/system/test/mock/mock_stack_btm_inq.cc @@ -44,6 +44,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/bt_hdr.h" #include "stack/include/btm_ble_api.h" #include "stack/include/inq_hci_link_interface.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_main.cc b/system/test/mock/mock_stack_btm_main.cc index 7df789b0c4..18fab63476 100644 --- a/system/test/mock/mock_stack_btm_main.cc +++ b/system/test/mock/mock_stack_btm_main.cc @@ -26,11 +26,13 @@ extern std::map<std::string, int> mock_function_count_map; #include <memory> #include <string> + #include "bt_target.h" #include "main/shim/dumpsys.h" #include "stack/btm/btm_int_types.h" #include "stack/include/btm_client_interface.h" #include "stack_config.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_btm_sec.cc b/system/test/mock/mock_stack_btm_sec.cc index 210e3566f2..0c60f47214 100644 --- a/system/test/mock/mock_stack_btm_sec.cc +++ b/system/test/mock/mock_stack_btm_sec.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h> #include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h> #include <string.h> + #include "btif/include/btif_storage.h" #include "common/metrics.h" #include "common/time_util.h" @@ -45,6 +46,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/btm_status.h" #include "stack/include/l2cap_security_interface.h" #include "stack/smp/smp_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_gap_conn.cc b/system/test/mock/mock_stack_gap_conn.cc index c6a425ae7f..378af0d626 100644 --- a/system/test/mock/mock_stack_gap_conn.cc +++ b/system/test/mock/mock_stack_gap_conn.cc @@ -36,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "osi/include/mutex.h" #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_gatt_auth.cc b/system/test/mock/mock_stack_gatt_auth.cc index d8837a2b3c..3c35a0f546 100644 --- a/system/test/mock/mock_stack_gatt_auth.cc +++ b/system/test/mock/mock_stack_gatt_auth.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/gatt/gatt_int.h" #include "stack/include/bt_hdr.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_gatt_connection_manager.cc b/system/test/mock/mock_stack_gatt_connection_manager.cc index c938153cf2..07d3297254 100644 --- a/system/test/mock/mock_stack_gatt_connection_manager.cc +++ b/system/test/mock/mock_stack_gatt_connection_manager.cc @@ -28,15 +28,18 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/callback.h> #include <base/location.h> #include <base/logging.h> + #include <map> #include <memory> #include <set> + #include "main/shim/shim.h" #include "osi/include/alarm.h" #include "osi/include/log.h" #include "stack/btm/btm_ble_bgconn.h" #include "stack/gatt/connection_manager.h" #include "stack/include/l2c_api.h" +#include "types/raw_address.h" using namespace connection_manager; diff --git a/system/test/mock/mock_stack_gatt_main.cc b/system/test/mock/mock_stack_gatt_main.cc index 4ec54515c2..9365d34b6c 100644 --- a/system/test/mock/mock_stack_gatt_main.cc +++ b/system/test/mock/mock_stack_gatt_main.cc @@ -34,6 +34,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/gatt/gatt_int.h" #include "stack/include/bt_hdr.h" #include "stack/include/l2cap_acl_interface.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_hidd_api.cc b/system/test/mock/mock_stack_hidd_api.cc index a25b8b23d4..17b25461d2 100644 --- a/system/test/mock/mock_stack_hidd_api.cc +++ b/system/test/mock/mock_stack_hidd_api.cc @@ -27,11 +27,13 @@ extern std::map<std::string, int> mock_function_count_map; #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "btm_api.h" #include "hidd_api.h" #include "hiddefs.h" #include "stack/btm/btm_sec.h" #include "stack/hid/hidd_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_l2cap_api.cc b/system/test/mock/mock_stack_l2cap_api.cc index ad389379cc..96d4eefd2c 100644 --- a/system/test/mock/mock_stack_l2cap_api.cc +++ b/system/test/mock/mock_stack_l2cap_api.cc @@ -46,6 +46,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/bt_hdr.h" #include "stack/include/l2c_api.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" // Mock include file to share data between tests and mock #include "test/mock/mock_stack_l2cap_api.h" diff --git a/system/test/mock/mock_stack_l2cap_api.h b/system/test/mock/mock_stack_l2cap_api.h index dfb5322a7d..6f682fc7db 100644 --- a/system/test/mock/mock_stack_l2cap_api.h +++ b/system/test/mock/mock_stack_l2cap_api.h @@ -48,6 +48,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/bt_hdr.h" #include "stack/include/l2c_api.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_l2cap_ble.cc b/system/test/mock/mock_stack_l2cap_ble.cc index a47ea55897..ada82b9367 100644 --- a/system/test/mock/mock_stack_l2cap_ble.cc +++ b/system/test/mock/mock_stack_l2cap_ble.cc @@ -35,6 +35,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_l2cap_ble.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_l2cap_link.cc b/system/test/mock/mock_stack_l2cap_link.cc index 7947f1be95..87a6eaa407 100644 --- a/system/test/mock/mock_stack_l2cap_link.cc +++ b/system/test/mock/mock_stack_l2cap_link.cc @@ -28,6 +28,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/bt_hdr.h" #include "stack/l2cap/l2c_int.h" +#include "types/raw_address.h" BT_HDR* l2cu_get_next_buffer_to_send(tL2C_LCB* p_lcb) { mock_function_count_map[__func__]++; return nullptr; diff --git a/system/test/mock/mock_stack_pan_api.cc b/system/test/mock/mock_stack_pan_api.cc index c270d6cbac..398c8c3d3a 100644 --- a/system/test/mock/mock_stack_pan_api.cc +++ b/system/test/mock/mock_stack_pan_api.cc @@ -36,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/btm/btm_sec.h" #include "stack/include/bt_hdr.h" #include "stack/pan/pan_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_rfcomm_port_api.cc b/system/test/mock/mock_stack_rfcomm_port_api.cc index 8a6f872498..ba070c44c2 100644 --- a/system/test/mock/mock_stack_rfcomm_port_api.cc +++ b/system/test/mock/mock_stack_rfcomm_port_api.cc @@ -26,6 +26,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <base/logging.h> #include <string.h> + #include "l2c_api.h" #include "osi/include/log.h" #include "osi/include/mutex.h" @@ -35,6 +36,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/btm_api_types.h" #include "stack/rfcomm/port_int.h" #include "stack/rfcomm/rfc_int.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_sdp_api.cc b/system/test/mock/mock_stack_sdp_api.cc index 2d6e7ceb6f..622e8161fd 100644 --- a/system/test/mock/mock_stack_sdp_api.cc +++ b/system/test/mock/mock_stack_sdp_api.cc @@ -30,6 +30,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_sdp_api.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_sdp_api.h b/system/test/mock/mock_stack_sdp_api.h index 51624771a1..16a8afcadd 100644 --- a/system/test/mock/mock_stack_sdp_api.h +++ b/system/test/mock/mock_stack_sdp_api.h @@ -40,6 +40,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "osi/include/osi.h" #include "stack/include/sdp_api.h" #include "stack/sdp/sdpint.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_sdp_main.cc b/system/test/mock/mock_stack_sdp_main.cc index 299ae434ee..e394f95a9b 100644 --- a/system/test/mock/mock_stack_sdp_main.cc +++ b/system/test/mock/mock_stack_sdp_main.cc @@ -25,6 +25,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <string.h> + #include "bt_target.h" #include "l2c_api.h" #include "l2cdefs.h" @@ -32,6 +33,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "sdp_api.h" #include "stack/btm/btm_sec.h" #include "stack/sdp/sdpint.h" +#include "types/raw_address.h" #ifndef UNUSED_ATTR #define UNUSED_ATTR diff --git a/system/test/mock/mock_stack_smp_act.cc b/system/test/mock/mock_stack_smp_act.cc index a7a25fb75f..9ea00ad1e3 100644 --- a/system/test/mock/mock_stack_smp_act.cc +++ b/system/test/mock/mock_stack_smp_act.cc @@ -37,6 +37,7 @@ extern std::map<std::string, int> mock_function_count_map; // Mock include file to share data between tests and mock #include "test/mock/mock_stack_smp_act.h" +#include "types/raw_address.h" // Mocked compile conditionals, if any #ifndef UNUSED_ATTR diff --git a/system/test/mock/mock_stack_smp_api.cc b/system/test/mock/mock_stack_smp_api.cc index 5193c9aaaa..eeb8d18cd3 100644 --- a/system/test/mock/mock_stack_smp_api.cc +++ b/system/test/mock/mock_stack_smp_api.cc @@ -25,6 +25,7 @@ extern std::map<std::string, int> mock_function_count_map; #include <string.h> + #include "bt_target.h" #include "main/shim/shim.h" #include "stack/btm/btm_dev.h" @@ -33,6 +34,7 @@ extern std::map<std::string, int> mock_function_count_map; #include "stack/include/smp_api.h" #include "stack/smp/smp_int.h" #include "stack_config.h" +#include "types/raw_address.h" #include "utils/include/bt_utils.h" #ifndef UNUSED_ATTR diff --git a/system/test/suite/adapter/adapter_unittest.cc b/system/test/suite/adapter/adapter_unittest.cc index 56720bda35..64beb40850 100644 --- a/system/test/suite/adapter/adapter_unittest.cc +++ b/system/test/suite/adapter/adapter_unittest.cc @@ -20,6 +20,7 @@ #include "btcore/include/property.h" #include "stack/include/bt_types.h" #include "types/bt_transport.h" +#include "types/raw_address.h" namespace { diff --git a/system/test/suite/adapter/bluetooth_test.cc b/system/test/suite/adapter/bluetooth_test.cc index 626ac420d6..be5660e088 100644 --- a/system/test/suite/adapter/bluetooth_test.cc +++ b/system/test/suite/adapter/bluetooth_test.cc @@ -17,10 +17,14 @@ ******************************************************************************/ #include "adapter/bluetooth_test.h" + #include <binder/ProcessState.h> #include <stdio.h> + #include <mutex> + #include "btcore/include/property.h" +#include "types/raw_address.h" namespace { diff --git a/system/test/suite/adapter/bluetooth_test.h b/system/test/suite/adapter/bluetooth_test.h index e35811d6cf..44f52c80da 100644 --- a/system/test/suite/adapter/bluetooth_test.h +++ b/system/test/suite/adapter/bluetooth_test.h @@ -25,10 +25,13 @@ #include <hardware/bt_sock.h> #include <signal.h> #include <time.h> + #include <map> #include <string> + #include "osi/include/semaphore.h" #include "service/hal/bluetooth_interface.h" +#include "types/raw_address.h" namespace bttest { diff --git a/system/test/suite/gatt/gatt_test.cc b/system/test/suite/gatt/gatt_test.cc index 8c8f1ab4ec..82a63dfb81 100644 --- a/system/test/suite/gatt/gatt_test.cc +++ b/system/test/suite/gatt/gatt_test.cc @@ -17,7 +17,9 @@ ******************************************************************************/ #include "gatt/gatt_test.h" + #include "adapter/bluetooth_test.h" +#include "types/raw_address.h" namespace bttest { diff --git a/system/test/suite/gatt/gatt_test.h b/system/test/suite/gatt/gatt_test.h index 6005346300..1b1edbb06a 100644 --- a/system/test/suite/gatt/gatt_test.h +++ b/system/test/suite/gatt/gatt_test.h @@ -18,6 +18,7 @@ #include "adapter/bluetooth_test.h" #include "service/hal/bluetooth_gatt_interface.h" +#include "types/raw_address.h" namespace bttest { diff --git a/system/test/suite/rfcomm/rfcomm_test.cc b/system/test/suite/rfcomm/rfcomm_test.cc index d5baf35f6a..775524286b 100644 --- a/system/test/suite/rfcomm/rfcomm_test.cc +++ b/system/test/suite/rfcomm/rfcomm_test.cc @@ -17,7 +17,9 @@ ******************************************************************************/ #include "rfcomm/rfcomm_test.h" + #include "adapter/bluetooth_test.h" +#include "types/raw_address.h" using bluetooth::Uuid; diff --git a/system/test/suite/rfcomm/rfcomm_test.h b/system/test/suite/rfcomm/rfcomm_test.h index 52f7f55494..4dc9a50374 100644 --- a/system/test/suite/rfcomm/rfcomm_test.h +++ b/system/test/suite/rfcomm/rfcomm_test.h @@ -17,6 +17,7 @@ ******************************************************************************/ #include "adapter/bluetooth_test.h" +#include "types/raw_address.h" namespace bttest { diff --git a/system/tools/bdtool/adapter.c b/system/tools/bdtool/adapter.c index a85e3d0cbf..241a351802 100644 --- a/system/tools/bdtool/adapter.c +++ b/system/tools/bdtool/adapter.c @@ -17,9 +17,11 @@ ******************************************************************************/ #include "support/adapter.h" + #include "base.h" #include "btcore/include/property.h" #include "support/callbacks.h" +#include "types/raw_address.h" static bt_state_t state; static int property_count = 0; diff --git a/system/tools/bdtool/bdtool.c b/system/tools/bdtool/bdtool.c index 44d11fff59..79258aef2d 100644 --- a/system/tools/bdtool/bdtool.c +++ b/system/tools/bdtool/bdtool.c @@ -25,6 +25,7 @@ #include "osi/include/osi.h" #include "test/suite/support/callbacks.h" #include "test/suite/support/hal.h" +#include "types/raw_address.h" static const Uuid HFP_UUID = Uuid::From128BitBE({{0x00, 0x00, 0x11, 0x1E, 0x00, 0x00, 0x10, 0x00, 0x80, |