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

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

Merge "stack::avdt::avdt_sec_check_complete_orig Use tBTM_STATUS parameter"... 

Merge "stack::avdt::avdt_sec_check_complete_orig Use tBTM_STATUS parameter" into main am: 9ab51f51 am: 730efdd9

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



Change-Id: I96c73caaffe25c6027f8dc14080b9edadf757a18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 560bbcc5 730efdd9

system/stack/avdt/avdt_l2c.cc

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void avdt_sec_check_complete_term(const RawAddress* bd_addr, tBT_TRANSPOR 
 *

 ******************************************************************************/

static void avdt_sec_check_complete_orig(const RawAddress* bd_addr, tBT_TRANSPORT transport,

                                         void* /* p_ref_data */, uint8_t res) {

                                         void* /* p_ref_data */, tBTM_STATUS res) {

  AvdtpCcb* p_ccb = NULL;

  AvdtpTransportChannel* p_tbl;