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

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

Merge "Fix a regression in tSMP_CB::reset" into main am: 23b35a6c am: b4c6c744 

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



Change-Id: I4381d934ecf7591d0d02cbaef966a8e99a3b0e94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf4202d0 b4c6c744

system/stack/smp/smp_utils.cc

+2 −1
Original line number Diff line number Diff line
@@ -942,7 +942,8 @@ void tSMP_CB::reset() { 
  alarm_cancel(this->smp_rsp_timer_ent);

  alarm_cancel(this->delayed_auth_timer_ent);



  init(init_security_mode);

  *this = {};

  this->init_security_mode = init_security_mode;



  this->p_callback = p_callback;

  this->init_security_mode = init_security_mode;