Loading system/bta/dm/bta_dm_disc.cc +0 −6 Original line number Diff line number Diff line Loading @@ -38,19 +38,15 @@ #include "common/circular_buffer.h" #include "common/init_flags.h" #include "common/strings.h" #include "device/include/interop.h" #include "internal_include/bt_target.h" #include "main/shim/dumpsys.h" #include "os/logging/log_adapter.h" #include "osi/include/allocator.h" #include "stack/btm/btm_int_types.h" // TimestampedStringCircularBuffer #include "stack/btm/neighbor_inquiry.h" #include "stack/include/bt_dev_class.h" #include "stack/include/bt_name.h" #include "stack/include/bt_uuid16.h" #include "stack/include/btm_client_interface.h" #include "stack/include/btm_log_history.h" #include "stack/include/btm_sec_api.h" // BTM_IsRemoteNameKnown #include "stack/include/gap_api.h" // GAP_BleReadPeerPrefConnParams #include "stack/include/hidh_api.h" #include "stack/include/main_thread.h" Loading @@ -67,8 +63,6 @@ using bluetooth::Uuid; using namespace bluetooth::legacy::stack::sdp; using namespace bluetooth; tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void); namespace { constexpr char kBtmLogTag[] = "SDP"; Loading system/bta/test/bta_sdp_test.cc +0 −7 Original line number Diff line number Diff line Loading @@ -17,14 +17,9 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> #include <string> #include "bta/dm/bta_dm_disc_int.h" #include "bta/test/bta_test_fixtures.h" #include "osi/include/allocator.h" #include "test/common/main_handler.h" #include "test/mock/mock_stack_btm_interface.h" #include "test/mock/mock_stack_gatt_api.h" void BTA_dm_on_hw_on(); void BTA_dm_on_hw_off(); Loading Loading @@ -73,7 +68,5 @@ TEST_F(BtaSdpRegisteredTest, bta_dm_sdp_result_SDP_SUCCESS) { bluetooth::legacy::testing::bta_dm_discovery_cb(); discovery_cb.service_index = BTA_MAX_SERVICE_ID; mock_btm_client_interface.security.BTM_SecReadDevName = [](const RawAddress& bd_addr) -> const char* { return kName; }; bluetooth::legacy::testing::bta_dm_sdp_result(SDP_SUCCESS); } Loading
system/bta/dm/bta_dm_disc.cc +0 −6 Original line number Diff line number Diff line Loading @@ -38,19 +38,15 @@ #include "common/circular_buffer.h" #include "common/init_flags.h" #include "common/strings.h" #include "device/include/interop.h" #include "internal_include/bt_target.h" #include "main/shim/dumpsys.h" #include "os/logging/log_adapter.h" #include "osi/include/allocator.h" #include "stack/btm/btm_int_types.h" // TimestampedStringCircularBuffer #include "stack/btm/neighbor_inquiry.h" #include "stack/include/bt_dev_class.h" #include "stack/include/bt_name.h" #include "stack/include/bt_uuid16.h" #include "stack/include/btm_client_interface.h" #include "stack/include/btm_log_history.h" #include "stack/include/btm_sec_api.h" // BTM_IsRemoteNameKnown #include "stack/include/gap_api.h" // GAP_BleReadPeerPrefConnParams #include "stack/include/hidh_api.h" #include "stack/include/main_thread.h" Loading @@ -67,8 +63,6 @@ using bluetooth::Uuid; using namespace bluetooth::legacy::stack::sdp; using namespace bluetooth; tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void); namespace { constexpr char kBtmLogTag[] = "SDP"; Loading
system/bta/test/bta_sdp_test.cc +0 −7 Original line number Diff line number Diff line Loading @@ -17,14 +17,9 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> #include <string> #include "bta/dm/bta_dm_disc_int.h" #include "bta/test/bta_test_fixtures.h" #include "osi/include/allocator.h" #include "test/common/main_handler.h" #include "test/mock/mock_stack_btm_interface.h" #include "test/mock/mock_stack_gatt_api.h" void BTA_dm_on_hw_on(); void BTA_dm_on_hw_off(); Loading Loading @@ -73,7 +68,5 @@ TEST_F(BtaSdpRegisteredTest, bta_dm_sdp_result_SDP_SUCCESS) { bluetooth::legacy::testing::bta_dm_discovery_cb(); discovery_cb.service_index = BTA_MAX_SERVICE_ID; mock_btm_client_interface.security.BTM_SecReadDevName = [](const RawAddress& bd_addr) -> const char* { return kName; }; bluetooth::legacy::testing::bta_dm_sdp_result(SDP_SUCCESS); }