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

Commit eb64a799 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "make btm_consolidate_cb static" into main am: 1b098168 

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



Change-Id: I8cac89bc077e889710849de8fe992a1604ae0cab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89410ce2 1b098168

system/stack/btm/btm_dev.cc

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ void btm_consolidate_dev(tBTM_SEC_DEV_REC* p_target_rec) { 
  }

}



BTM_CONSOLIDATION_CB* btm_consolidate_cb = nullptr;

static BTM_CONSOLIDATION_CB* btm_consolidate_cb = nullptr;



void BTM_SetConsolidationCallback(BTM_CONSOLIDATION_CB* cb) {

  btm_consolidate_cb = cb;