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

Commit 96516e03 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

L2cap Signalling manager: Fix OnCommandReject am: 58d3ee2e am: bc61b6ff 

Change-Id: I76e7eb5a2a234a3a513ddafc158d861b865a4ec4
parents d31c8c6d bc61b6ff

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;

  }