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

Commit 11ff2633 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HCI: Add address to LinkKeyRequestReplyComplete" am: 01667423 am:... 

Merge "HCI: Add address to LinkKeyRequestReplyComplete" am: 01667423 am: 6387caa0 am: aa0564c4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1865655

Change-Id: I3fd9e65acbaebb2eaaf4b41063d00208b9a1888d
parents 6990ceb1 aa0564c4

system/gd/hci/hci_packets.pdl

+1 −0
Original line number Original line Diff line number Diff line
@@ -1009,6 +1009,7 @@ packet LinkKeyRequestReply : SecurityCommand (op_code = LINK_KEY_REQUEST_REPLY) 




packet LinkKeyRequestReplyComplete : CommandComplete (command_op_code = LINK_KEY_REQUEST_REPLY) {

packet LinkKeyRequestReplyComplete : CommandComplete (command_op_code = LINK_KEY_REQUEST_REPLY) {

  status : ErrorCode,

  status : ErrorCode,

  bd_addr : Address,

}

}





packet LinkKeyRequestNegativeReply : SecurityCommand (op_code = LINK_KEY_REQUEST_NEGATIVE_REPLY) {

packet LinkKeyRequestNegativeReply : SecurityCommand (op_code = LINK_KEY_REQUEST_NEGATIVE_REPLY) {

system/vendor_libs/test_vendor_lib/model/controller/dual_mode_controller.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1513,7 +1513,7 @@ void DualModeController::LinkKeyRequestReply(CommandView command) { 
  auto key = command_view.GetLinkKey();

  auto key = command_view.GetLinkKey();

  auto status = link_layer_controller_.LinkKeyRequestReply(addr, key);

  auto status = link_layer_controller_.LinkKeyRequestReply(addr, key);

  auto packet = bluetooth::hci::LinkKeyRequestReplyCompleteBuilder::Create(

  auto packet = bluetooth::hci::LinkKeyRequestReplyCompleteBuilder::Create(

      kNumCommandPackets, status);

      kNumCommandPackets, status, addr);

  send_event_(std::move(packet));

  send_event_(std::move(packet));

}

}