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

Commit 8b03a8ec authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Check before handle next command" am: 16bb5582 

am: ac8b8818

Change-Id: I84a3dfe7baf9a2e576e96c21d6d1e51ddda155d1
parents 8705db98 ac8b8818

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

+0 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ void ClassicSignallingManager::OnConnectionResponse(SignalId signal_id, Cid remo 
  }

  alarm_.Cancel();

  SendConfigurationRequest(remote_cid, {});

  handle_send_next_command();

}



void ClassicSignallingManager::OnConfigurationRequest(SignalId signal_id, Cid cid, Continuation is_continuation,
@@ -193,7 +192,6 @@ void ClassicSignallingManager::OnConfigurationRequest(SignalId signal_id, Cid ci 
  auto response = ConfigurationResponseBuilder::Create(signal_id.Value(), channel->GetRemoteCid(), is_continuation,

                                                       ConfigurationResponseResult::SUCCESS, {});

  enqueue_buffer_->Enqueue(std::move(response), handler_);

  handle_send_next_command();

  channel->SetIncomingConfigurationStatus(DynamicChannelImpl::ConfigurationStatus::CONFIGURED);

  if (channel->GetOutgoingConfigurationStatus() == DynamicChannelImpl::ConfigurationStatus::CONFIGURED) {

    std::unique_ptr<DynamicChannel> user_channel = std::make_unique<DynamicChannel>(channel, handler_);