Un-include stack/btm/btm_int

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I1271da085b9ea67e579796e20e3664773ceefcd8

diff --git a/bta/gatt/bta_gattc_cache.cc b/bta/gatt/bta_gattc_cache.cc
index 895d085..f52b8c8 100644 (file)
--- a/bta/gatt/bta_gattc_cache.cc
+++ b/bta/gatt/bta_gattc_cache.cc
@@ -37,7 +37,6 @@
 #include "bta_gattc_int.h"
 #include "btm_api.h"
 #include "btm_ble_api.h"
-#include "btm_int.h"
 #include "database.h"
 #include "database_builder.h"
 #include "osi/include/log.h"

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 9918f9a..4437e98 100644 (file)
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -72,7 +72,6 @@
 #include "osi/include/osi.h"
 #include "osi/include/properties.h"
 #include "stack/btm/btm_dev.h"
-#include "stack/btm/btm_int.h"
 #include "stack/btm/btm_sec.h"
 #include "stack_config.h"
 

diff --git a/btif/src/stack_manager.cc b/btif/src/stack_manager.cc
index 27c950c..f954268 100644 (file)
--- a/btif/src/stack_manager.cc
+++ b/btif/src/stack_manager.cc
@@ -44,7 +44,6 @@
 #include "btif_profile_queue.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/bte.h"
-#include "stack/btm/btm_int.h"
 #include "stack/include/gatt_api.h"
 #include "stack/include/l2c_api.h"
 #include "stack/include/port_api.h"

diff --git a/stack/bnep/bnep_int.h b/stack/bnep/bnep_int.h
index 1675e2f..bce8a76 100644 (file)
--- a/stack/bnep/bnep_int.h
+++ b/stack/bnep/bnep_int.h
@@ -28,7 +28,6 @@
 #include "bnep_api.h"
 #include "bt_common.h"
 #include "bt_target.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "osi/include/fixed_queue.h"
 

diff --git a/stack/bnep/bnep_utils.cc b/stack/bnep/bnep_utils.cc
index 4813ce3..3da1872 100644 (file)
--- a/stack/bnep/bnep_utils.cc
+++ b/stack/bnep/bnep_utils.cc
@@ -30,7 +30,6 @@
 #include "bt_common.h"
 #include "bt_types.h"
 #include "bt_utils.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "device/include/controller.h"
 #include "osi/include/osi.h"

diff --git a/stack/btm/btm_ble_addr.cc b/stack/btm/btm_ble_addr.cc
index 2c3d7ba..5155abb 100644 (file)
--- a/stack/btm/btm_ble_addr.cc
+++ b/stack/btm/btm_ble_addr.cc
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "bt_types.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "device/include/controller.h"
 #include "gap_api.h"

diff --git a/stack/btm/btm_ble_int.h b/stack/btm/btm_ble_int.h
index 0f10fa8..e37e643 100644 (file)
--- a/stack/btm/btm_ble_int.h
+++ b/stack/btm/btm_ble_int.h
@@ -30,7 +30,6 @@
 #include "bt_target.h"
 #include "btm_ble_api.h"
 #include "btm_ble_int_types.h"
-#include "btm_int.h"
 #include "btm_int_types.h"
 #include "hcidefs.h"
 #include "smp_api.h"

diff --git a/stack/btm/btm_dev.cc b/stack/btm/btm_dev.cc
index 6a88787..2a053d5 100644 (file)
--- a/stack/btm/btm_dev.cc
+++ b/stack/btm/btm_dev.cc
@@ -30,7 +30,6 @@
 #include "bt_common.h"
 #include "bt_types.h"
 #include "btm_api.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "device/include/controller.h"
 #include "hcidefs.h"

diff --git a/stack/btm/btm_main.cc b/stack/btm/btm_main.cc
index 53f532e..e997925 100644 (file)
--- a/stack/btm/btm_main.cc
+++ b/stack/btm/btm_main.cc
@@ -26,7 +26,6 @@
 #include <string>
 #include "bt_target.h"
 #include "bt_types.h"
-#include "btm_int.h"
 #include "main/shim/dumpsys.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/include/btm_client_interface.h"

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 62bc232..fedb2d5 100644 (file)
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -32,7 +32,6 @@
 
 #include "bt_types.h"
 #include "btif/include/btif_storage.h"
-#include "btm_int.h"
 #include "common/metrics.h"
 #include "common/time_util.h"
 #include "device/include/controller.h"

diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
index e1b1fd5..5eba571 100644 (file)
--- a/stack/btu/btu_hcif.cc
+++ b/stack/btu/btu_hcif.cc
@@ -35,7 +35,6 @@
 #include "common/metrics.h"
 #include "device/include/controller.h"
 #include "osi/include/log.h"
-#include "stack/btm/btm_int.h"
 #include "stack/include/acl_hci_link_interface.h"
 #include "stack/include/ble_acl_interface.h"
 #include "stack/include/ble_hci_link_interface.h"

diff --git a/stack/btu/btu_task.cc b/stack/btu/btu_task.cc
index 0c8c580..a857900 100644 (file)
--- a/stack/btu/btu_task.cc
+++ b/stack/btu/btu_task.cc
@@ -30,7 +30,6 @@
 #include "btm_iso_api.h"
 #include "common/message_loop_thread.h"
 #include "osi/include/osi.h"
-#include "stack/btm/btm_int.h"
 #include "stack/include/acl_hci_link_interface.h"
 #include "stack/include/btu.h"
 

diff --git a/stack/gatt/gatt_api.cc b/stack/gatt/gatt_api.cc
index 0189c40..742f9e2 100644 (file)
--- a/stack/gatt/gatt_api.cc
+++ b/stack/gatt/gatt_api.cc
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "bt_common.h"
-#include "btm_int.h"
 #include "device/include/controller.h"
 #include "gatt_api.h"
 #include "gatt_int.h"

diff --git a/stack/gatt/gatt_db.cc b/stack/gatt/gatt_db.cc
index 27d26b9..6c96b48 100644 (file)
--- a/stack/gatt/gatt_db.cc
+++ b/stack/gatt/gatt_db.cc
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "btm_int.h"
 #include "gatt_int.h"
 #include "l2c_api.h"
 #include "osi/include/osi.h"

diff --git a/stack/gatt/gatt_main.cc b/stack/gatt/gatt_main.cc
index 361ce6a..a7afeb4 100644 (file)
--- a/stack/gatt/gatt_main.cc
+++ b/stack/gatt/gatt_main.cc
@@ -28,7 +28,6 @@
 #include "bt_utils.h"
 #include "btif_storage.h"
 #include "btm_ble_int.h"
-#include "btm_int.h"
 #include "connection_manager.h"
 #include "device/include/interop.h"
 #include "eatt.h"

diff --git a/stack/gatt/gatt_utils.cc b/stack/gatt/gatt_utils.cc
index 974c771..4881680 100644 (file)
--- a/stack/gatt/gatt_utils.cc
+++ b/stack/gatt/gatt_utils.cc
@@ -29,7 +29,6 @@
 #include "bt_common.h"
 #include "stdio.h"
 
-#include "btm_int.h"
 #include "connection_manager.h"
 #include "gatt_api.h"
 #include "gatt_int.h"

diff --git a/stack/hcic/hcicmds.cc b/stack/hcic/hcicmds.cc
index 61f96ef..f552749 100644 (file)
--- a/stack/hcic/hcicmds.cc
+++ b/stack/hcic/hcicmds.cc
@@ -32,7 +32,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "btm_int.h" /* Included for UIPC_* macro definitions */
 #include "stack/include/acl_hci_link_interface.h"
 
 #include "bt_target.h"

diff --git a/stack/hid/hidh_api.cc b/stack/hid/hidh_api.cc
index 6852fb6..1499abe 100644 (file)
--- a/stack/hid/hidh_api.cc
+++ b/stack/hid/hidh_api.cc
@@ -29,7 +29,6 @@
 #include "bt_common.h"
 #include "bt_types.h"
 #include "btm_api.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "hiddefs.h"
 #include "hidh_api.h"

diff --git a/stack/rfcomm/port_rfc.cc b/stack/rfcomm/port_rfc.cc
index f5186ff..53cbdba 100644 (file)
--- a/stack/rfcomm/port_rfc.cc
+++ b/stack/rfcomm/port_rfc.cc
@@ -32,7 +32,6 @@
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "btm_api.h"
-#include "btm_int.h"
 #include "port_api.h"
 #include "port_int.h"
 #include "rfc_int.h"

diff --git a/stack/rfcomm/rfc_port_fsm.cc b/stack/rfcomm/rfc_port_fsm.cc
index 8634ad5..b62f785 100644 (file)
--- a/stack/rfcomm/rfc_port_fsm.cc
+++ b/stack/rfcomm/rfc_port_fsm.cc
@@ -27,7 +27,6 @@
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "btm_api.h"
-#include "btm_int.h"
 #include "osi/include/osi.h"
 #include "port_api.h"
 #include "port_int.h"

diff --git a/stack/rfcomm/rfc_utils.cc b/stack/rfcomm/rfc_utils.cc
index 3dee8a1..553a148 100644 (file)
--- a/stack/rfcomm/rfc_utils.cc
+++ b/stack/rfcomm/rfc_utils.cc
@@ -27,7 +27,6 @@
 
 #include "bt_utils.h"
 #include "btm_api.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "osi/include/osi.h"
 #include "port_api.h"

diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index 3403353..1e38c13 100644 (file)
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -27,7 +27,6 @@
 #include "main/shim/shim.h"
 #include "osi/include/log.h"
 #include "stack/btm/btm_dev.h"
-#include "stack/btm/btm_int.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/l2c_api.h"

diff --git a/stack/smp/smp_api.cc b/stack/smp/smp_api.cc
index 18b0bb9..28eb539 100644 (file)
--- a/stack/smp/smp_api.cc
+++ b/stack/smp/smp_api.cc
@@ -29,7 +29,6 @@
 #include "bt_utils.h"
 #include "stack_config.h"
 
-#include "btm_int.h"
 #include "hcimsgs.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"

diff --git a/stack/smp/smp_keys.cc b/stack/smp/smp_keys.cc
index ec06cad..1a8a3a5 100644 (file)
--- a/stack/smp/smp_keys.cc
+++ b/stack/smp/smp_keys.cc
@@ -28,7 +28,6 @@
 #include "bt_utils.h"
 #include "btm_ble_api.h"
 #include "btm_ble_int.h"
-#include "btm_int.h"
 #include "device/include/controller.h"
 #include "hcimsgs.h"
 #include "osi/include/osi.h"

diff --git a/stack/smp/smp_utils.cc b/stack/smp/smp_utils.cc
index 703c93e..0af1fd0 100644 (file)
--- a/stack/smp/smp_utils.cc
+++ b/stack/smp/smp_utils.cc
@@ -28,7 +28,6 @@
 #include "bt_types.h"
 #include "bt_utils.h"
 #include "btm_ble_api.h"
-#include "btm_int.h"
 #include "common/metrics.h"
 #include "device/include/controller.h"
 #include "hcidefs.h"

diff --git a/stack/test/btm/stack_btm_test.cc b/stack/test/btm/stack_btm_test.cc
index 9d039dc..9532bba 100644 (file)
--- a/stack/test/btm/stack_btm_test.cc
+++ b/stack/test/btm/stack_btm_test.cc
@@ -24,7 +24,6 @@
 #include "hci/include/hci_packet_factory.h"
 #include "internal_include/stack_config.h"
 #include "osi/include/osi.h"
-#include "stack/btm/btm_int.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/include/acl_hci_link_interface.h"
 #include "types/raw_address.h"

diff --git a/stack/test/common/mock_btu_hcif.cc b/stack/test/common/mock_btu_hcif.cc
index cf7b2b6..8eeb1c4 100644 (file)
--- a/stack/test/common/mock_btu_hcif.cc
+++ b/stack/test/common/mock_btu_hcif.cc
@@ -32,7 +32,6 @@ extern std::map<std::string, int> mock_function_count_map;
 #include "common/metrics.h"
 #include "device/include/controller.h"
 #include "osi/include/log.h"
-#include "stack/btm/btm_int.h"
 #include "stack/include/acl_hci_link_interface.h"
 #include "stack/include/ble_acl_interface.h"
 #include "stack/include/ble_hci_link_interface.h"

diff --git a/stack/test/common/mock_gatt_main.cc b/stack/test/common/mock_gatt_main.cc
index 12edff5..687154a 100644 (file)
--- a/stack/test/common/mock_gatt_main.cc
+++ b/stack/test/common/mock_gatt_main.cc
@@ -27,7 +27,6 @@ extern std::map<std::string, int> mock_function_count_map;
 #include "bt_common.h"
 #include "bt_target.h"
 #include "btm_ble_int.h"
-#include "btm_int.h"
 #include "device/include/interop.h"
 #include "l2c_api.h"
 #include "osi/include/osi.h"

diff --git a/stack/test/common/mock_hcic_hcicmds.cc b/stack/test/common/mock_hcic_hcicmds.cc
index ea8f0f9..18c8416 100644 (file)
--- a/stack/test/common/mock_hcic_hcicmds.cc
+++ b/stack/test/common/mock_hcic_hcicmds.cc
@@ -29,7 +29,6 @@ extern std::map<std::string, int> mock_function_count_map;
 #include <string.h>
 #include "bt_common.h"
 #include "bt_target.h"
-#include "btm_int.h"
 #include "btu.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"

diff --git a/stack/test/common/mock_smp_smp_api.cc b/stack/test/common/mock_smp_smp_api.cc
index df96f73..465f918 100644 (file)
--- a/stack/test/common/mock_smp_smp_api.cc
+++ b/stack/test/common/mock_smp_smp_api.cc
@@ -26,7 +26,6 @@ extern std::map<std::string, int> mock_function_count_map;
 
 #include <string.h>
 #include "bt_target.h"
-#include "btm_int.h"
 #include "hcimsgs.h"
 #include "main/shim/shim.h"
 #include "stack/btm/btm_dev.h"

diff --git a/stack/test/rfcomm/stack_rfcomm_test.cc b/stack/test/rfcomm/stack_rfcomm_test.cc
index 59edbaa..b20bc8b 100644 (file)
--- a/stack/test/rfcomm/stack_rfcomm_test.cc
+++ b/stack/test/rfcomm/stack_rfcomm_test.cc
@@ -26,7 +26,6 @@
 #include "osi/include/osi.h"
 #include "port_api.h"
 
-#include "btm_int.h"
 #include "rfc_int.h"
 
 #include "mock_btm_layer.h"