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

Commit 0b85cd81 authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove unused function bta_dm_disc_stop_service_discovery 

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, dead code removal
Change-Id: I6245ca51a2f339ec99fd9130cb6829407d2082cc
parent d4979ff6

system/bta/dm/bta_dm_disc.cc

+0 −5
Original line number Original line Diff line number Diff line
@@ -2413,11 +2413,6 @@ void bta_dm_disc_start_service_discovery(service_discovery_callbacks cbacks, 
  bta_sys_sendmsg(p_msg);

  bta_sys_sendmsg(p_msg);

}

}





void bta_dm_disc_stop_service_discovery(const RawAddress& /* bd_addr */,

                                        tBT_TRANSPORT /* transport */) {

  log::warn("Stop service discovery not yet implemented for legacy module");

}



#define DUMPSYS_TAG "shim::legacy::bta::dm"

#define DUMPSYS_TAG "shim::legacy::bta::dm"

void DumpsysBtaDmDisc(int fd) {

void DumpsysBtaDmDisc(int fd) {

  auto copy = search_state_history_.Pull();

  auto copy = search_state_history_.Pull();

system/bta/dm/bta_dm_disc.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,6 @@ void bta_dm_disc_stop_device_discovery(); 
void bta_dm_disc_start_service_discovery(service_discovery_callbacks cbacks,

void bta_dm_disc_start_service_discovery(service_discovery_callbacks cbacks,

                                         const RawAddress& bd_addr,

                                         const RawAddress& bd_addr,

                                         tBT_TRANSPORT transport);

                                         tBT_TRANSPORT transport);

void bta_dm_disc_stop_service_discovery(const RawAddress& bd_addr,

                                        tBT_TRANSPORT transport);





// Bta subsystem entrypoint and lifecycle

// Bta subsystem entrypoint and lifecycle

bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg);

bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg);

system/bta/test/bta_disc_test.cc

+0 −15
Original line number Original line Diff line number Diff line
@@ -262,21 +262,6 @@ TEST_F(BtaInitializedTest, 
      kRawAddress, BT_TRANSPORT_LE);

      kRawAddress, BT_TRANSPORT_LE);

}

}





TEST_F(BtaInitializedTest,

       bta_dm_disc_stop_service_discovery__BT_TRANSPORT_AUTO) {

  bta_dm_disc_stop_service_discovery(kRawAddress, BT_TRANSPORT_AUTO);

}



TEST_F(BtaInitializedTest,

       bta_dm_disc_stop_service_discovery__BT_TRANSPORT_BR_EDR) {

  bta_dm_disc_stop_service_discovery(kRawAddress, BT_TRANSPORT_BR_EDR);

}



TEST_F(BtaInitializedTest,

       bta_dm_disc_stop_service_discovery__BT_TRANSPORT_LE) {

  bta_dm_disc_stop_service_discovery(kRawAddress, BT_TRANSPORT_LE);

}



TEST_F(BtaInitializedTest, init_bta_dm_search_cb__conn_id) {

TEST_F(BtaInitializedTest, init_bta_dm_search_cb__conn_id) {

  constexpr uint16_t kConnId = 123;

  constexpr uint16_t kConnId = 123;