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

Commit 58d3ee2e authored by Hansong Zhang's avatar Hansong Zhang
Browse files

L2cap Signalling manager: Fix OnCommandReject 

Checking command_just_sent_.command_code_ !=
command_reject_view.GetCode() doesn't make sense because
command_just_sent_.command_code_ is never CommandReject, but XyzRequest,
where command_reject_view.GetCode() is always CommandReject. We
shouldn't check it here.

Bug: 145707677
Test: cert/run --host
Change-Id: I424a8f715ef49372762c6df870d9c63de3b8c597
parent 09938711

system/gd/l2cap/classic/internal/signalling_manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ ClassicSignallingManager::~ClassicSignallingManager() { 
}



void ClassicSignallingManager::OnCommandReject(CommandRejectView command_reject_view) {

  if (command_just_sent_.signal_id_ != command_reject_view.GetIdentifier() ||

      command_just_sent_.command_code_ != command_reject_view.GetCode()) {

  if (command_just_sent_.signal_id_ != command_reject_view.GetIdentifier()) {

    LOG_WARN("Unexpected command reject: no pending request");

    return;

  }

system/gd/l2cap/le/internal/signalling_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void LeSignallingManager::CancelAlarm() { 


void LeSignallingManager::OnCommandReject(LeCommandRejectView command_reject_view) {

  auto signal_id = command_reject_view.GetIdentifier();

  if (signal_id != command_just_sent_.signal_id_ || command_just_sent_.command_code_ != command_reject_view.GetCode()) {

  if (signal_id != command_just_sent_.signal_id_) {

    LOG_WARN("Unexpected response: no pending request");

    return;

  }