commit 7b46c6c10157b8a0632492c750ef58c2ed6d0559
author Myles Watson <mylesgw@google.com> Wed Oct 28 15:56:41 2020 -0700
committer Martin Brabham <optedoblivion@google.com> Thu Oct 29 21:44:50 2020 +0000
tree f0f730aaf4d760bb95f66b0174b87305639db7ef
parent a3bfa06c768b1c66434e3b4e3161c3d2ac214123

Security: Send LinkKey reply without std::move

Bug: 162984360
Test: ./cert/run --host SecurityTest
Change-Id: Ib39682ff4e02af46396d7c133fb7b4faf72f8c16

system/gd/security/pairing/classic_pairing_handler.cc

diff --git a/system/gd/security/pairing/classic_pairing_handler.cc b/system/gd/security/pairing/classic_pairing_handler.cc
index 4e13b6e..7b1578d 100644
--- a/system/gd/security/pairing/classic_pairing_handler.cc
+++ b/system/gd/security/pairing/classic_pairing_handler.cc
@@ -150,16 +150,15 @@
   LOG_INFO("Received: %s", hci::EventCodeText(packet.GetEventCode()).c_str());
   ASSERT_LOG(GetRecord()->GetPseudoAddress()->GetAddress() == packet.GetBdAddr(), "Address mismatch");
   if (GetRecord()->IsPaired()) {
-    auto packet = hci::LinkKeyRequestReplyBuilder::Create(
-        GetRecord()->GetPseudoAddress()->GetAddress(), GetRecord()->GetLinkKey());
     LOG_INFO("Sending: LINK_KEY_REQUEST_REPLY");
-    this->GetChannel()->SendCommand(std::move(packet));
+    this->GetChannel()->SendCommand(hci::LinkKeyRequestReplyBuilder::Create(
+        GetRecord()->GetPseudoAddress()->GetAddress(), GetRecord()->GetLinkKey()));
     last_status_ = hci::ErrorCode::SUCCESS;
     Cancel();
   } else {
-    auto packet = hci::LinkKeyRequestNegativeReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress());
     LOG_INFO("Sending: LINK_KEY_REQUEST_NEGATIVE_REPLY");
-    this->GetChannel()->SendCommand(std::move(packet));
+    this->GetChannel()->SendCommand(
+        hci::LinkKeyRequestNegativeReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));
   }
 }