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

Commit 3cdcc780 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

SM: Ensure we cannot cancel a pairing handler twice. am: bcdc4fb8 am: 2fbe0b0f 

Change-Id: I9d2dce68461b1e063d49c3f332f187dad26d6d9b
parents ae5b4ee3 2fbe0b0f

system/gd/security/pairing/classic_pairing_handler.cc

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ void ClassicPairingHandler::Initiate(bool locally_initiated, hci::IoCapability i 
}



void ClassicPairingHandler::Cancel() {

  if (is_cancelled_) return;

  is_cancelled_ = true;

  PairingResultOrFailure result = PairingResult();

  if (last_status_ != hci::ErrorCode::SUCCESS) {

    result = PairingFailure(hci::ErrorCodeText(last_status_));

system/gd/security/pairing/classic_pairing_handler.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ class ClassicPairingHandler : public PairingHandler { 
  UI* user_interface_;

  os::Handler* user_interface_handler_;

  std::string device_name_;

  bool is_cancelled_ = false;



  hci::ErrorCode last_status_ = hci::ErrorCode::UNKNOWN_HCI_COMMAND;

  bool locally_initiated_ = false;