From: Hansong Zhang <hsz@google.com>
Date: Mon, 11 Nov 2019 19:07:46 +0000 (-0800)
Subject: L2CAP: Swap SCID and DCID in connection response
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4670e8cca615cfdb2945f066d8792f8996051562;p=android-x86%2Fsystem-bt.git

L2CAP: Swap SCID and DCID in connection response

SCID should copy from conneciton request

Bug: 141557006
Test: run_cert.sh
Change-Id: Ieb8757a279053ea1f4e59ad898c730e4bcdc1dea
---

diff --git a/gd/l2cap/classic/internal/signalling_manager.cc b/gd/l2cap/classic/internal/signalling_manager.cc
index 47792b08f..8aa3d30f9 100644
--- a/gd/l2cap/classic/internal/signalling_manager.cc
+++ b/gd/l2cap/classic/internal/signalling_manager.cc
@@ -450,7 +450,7 @@ void ClassicSignallingManager::on_incoming_packet() {
 void ClassicSignallingManager::send_connection_response(SignalId signal_id, Cid remote_cid, Cid local_cid,
                                                         ConnectionResponseResult result,
                                                         ConnectionResponseStatus status) {
-  auto builder = ConnectionResponseBuilder::Create(signal_id.Value(), remote_cid, local_cid, result, status);
+  auto builder = ConnectionResponseBuilder::Create(signal_id.Value(), local_cid, remote_cid, result, status);
   enqueue_buffer_->Enqueue(std::move(builder), handler_);
 }