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

Commit aa0437a9 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

bta: Fully encapsulate tBTA_DM_SEARCH_CB am: 7513109b am: 2142bb2e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2825178



Change-Id: I988eb8d8a581ae26d7cadac3e4312d2e8de7abce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5dfe24cd 2142bb2e

system/bta/dm/bta_dm_disc.cc

+4 −3
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void); 


namespace {

constexpr char kBtmLogTag[] = "SDP";

}



tBTA_DM_SEARCH_CB bta_dm_search_cb;

}  // namespace



static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status);

static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,
@@ -2197,9 +2199,8 @@ std::string EpochMillisToString(long long time_ms) { 
      "%s.%03u", s.c_str(),

      static_cast<unsigned int>(time_ms % MillisPerSecond));

}

}  // namespace



tBTA_DM_SEARCH_CB bta_dm_search_cb;

}  // namespace



struct tSEARCH_STATE_HISTORY {

  const tBTA_DM_STATE state;

system/bta/dm/bta_dm_int.h

+0 −3
Original line number Diff line number Diff line
@@ -479,9 +479,6 @@ extern tBTA_DM_CB bta_dm_cb; 
/* DM control block for ACL management */

extern tBTA_DM_ACL_CB bta_dm_acl_cb;



/* DM search control block */

extern tBTA_DM_SEARCH_CB bta_dm_search_cb;



/* DI control block */

extern tBTA_DM_DI_CB bta_dm_di_cb;