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

Commit 7b1776a2 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] clean up headers in btm_dev.h with iwyu" into main

parents d7c80978 2954b62d
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@
#include "advertise_data_parser.h"
#include "bta/dm/bta_dm_disc.h"
#include "bta/include/bta_api.h"
#include "bta_dm_int.h"
#include "btif/include/stack_manager.h"
#include "btif_api.h"
#include "btif_bqr.h"
@@ -68,7 +67,6 @@
#include "device/include/interop.h"
#include "gd/common/lru_cache.h"
#include "internal_include/stack_config.h"
#include "main/shim/dumpsys.h"
#include "main/shim/le_advertising_manager.h"
#include "osi/include/allocator.h"
#include "osi/include/osi.h"
@@ -76,6 +74,7 @@
#include "osi/include/stack_power_telemetry.h"
#include "stack/btm/btm_dev.h"
#include "stack/btm/btm_sec.h"
#include "stack/include/acl_api.h"
#include "stack/include/acl_api_types.h"
#include "stack/include/bt_octets.h"
#include "stack/include/bt_uuid16.h"
@@ -84,6 +83,7 @@
#include "stack/include/btm_log_history.h"
#include "stack/include/btm_sec_api.h"
#include "stack/include/btm_sec_api_types.h"
#include "stack/include/smp_api.h"
#include "stack/sdp/sdpint.h"
#include "stack_config.h"
#include "types/raw_address.h"
+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@
 * limitations under the License.
 */

#define LOG_TAG "stack_power_tel"

#include "osi/include/stack_power_telemetry.h"

#include <base/logging.h>
@@ -25,10 +27,12 @@
#include <map>
#include <mutex>

#include "common/init_flags.h"
#include "os/log.h"
#include "osi/include/properties.h"
#include "stack/btm/btm_dev.h"
#include "stack/include/acl_api_types.h"
#include "stack/include/bt_psm_types.h"
#include "stack/include/btm_status.h"
#include "types/raw_address.h"

time_t get_current_time() { return time(0); }
+4 −0
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@
 * limitations under the License.
 */

#define LOG_TAG "acl"

#include <cstdint>

#include "gd/common/init_flags.h"
#include "os/log.h"
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/btm_dev.h"
#include "stack/btm/btm_sec.h"
+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@
#include "stack/include/acl_hci_link_interface.h"
#include "stack/include/bt_hdr.h"
#include "stack/include/btm_api.h"
#include "stack/include/btm_ble_api.h"
#include "stack/include/btm_iso_api.h"
#include "stack/include/hci_error_code.h"
#include "stack/include/l2cap_acl_interface.h"
+3 −4
Original line number Diff line number Diff line
@@ -25,21 +25,20 @@

#define LOG_TAG "bt_btm_ble"

#include <base/logging.h>
#include <base/strings/stringprintf.h>

#include <cstdint>

#include "btif/include/btif_storage.h"
#include "device/include/controller.h"
#include "main/shim/btm_api.h"
#include "main/shim/l2c_api.h"
#include "main/shim/shim.h"
#include "os/log.h"
#include "osi/include/allocator.h"
#include "osi/include/properties.h"
#include "platform_ssl_mem.h"
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/btm_dev.h"
#include "stack/btm/btm_int_types.h"
#include "stack/btm/btm_sec.h"
#include "stack/btm/btm_sec_cb.h"
#include "stack/btm/btm_sec_int_types.h"
#include "stack/btm/security_device_record.h"
Loading