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

Commit e7e4508b authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "gd: Update the definition of ExtendedInquiryResultRaw event" am:... 

Merge "gd: Update the definition of ExtendedInquiryResultRaw event" am: ff56b30b am: 4fe92987 am: 8893a4cc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2318958



Change-Id: I08932c9ffee697b88d975520bb0117f33fb668b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49fd0a35 8893a4cc

system/gd/hci/hci_packets.pdl

+1 −2
Original line number Diff line number Diff line
@@ -5527,11 +5527,10 @@ packet ExtendedInquiryResultRaw : Event (event_code = EXTENDED_INQUIRY_RESULT) { 
  clock_offset : 15,

  _reserved_ : 1,

  rssi : 8,

  extended_inquiry_response : 8[],

  // Extended inquiry Result is always 255 bytes long

  // padded GapData with zeroes as necessary

  // Refer to BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 3, Part C Section 8 on page 1340

  _padding_[240],

  extended_inquiry_response : 8[240],

}

tools/rootcanal/model/controller/link_layer_controller.cc

+1 −2
Original line number Diff line number Diff line
@@ -2249,8 +2249,7 @@ void LinkLayerController::IncomingInquiryResponsePacket( 
              inquiry_response.GetPageScanRepetitionMode()),

          inquiry_response.GetClassOfDevice(),

          inquiry_response.GetClockOffset(), inquiry_response.GetRssi(),

          std::vector<uint8_t>(extended_inquiry_response_.begin(),

                               extended_inquiry_response_.end())));

          extended_inquiry_response_));

    } break;

    default:

      LOG_WARN("Unhandled Incoming Inquiry Response of type %d",