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

Commit 063b2fe0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Use the resolved address type" am: b3106508 am: b7ca644d 

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



Change-Id: Ide65182f12548ba1a3524b0912cd427b2f5f118a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b8cdb46 b7ca644d

tools/rootcanal/model/controller/link_layer_controller.cc

+3 −2
Original line number Diff line number Diff line
@@ -1685,9 +1685,10 @@ uint16_t LinkLayerController::HandleLeConnection( 
    AddressType peer_address_type = address.GetAddressType();

    if (peer_resolved_address != AddressWithType()) {

      peer_resolvable_private_address = address.GetAddress();

      if (address.GetAddressType() == AddressType::PUBLIC_DEVICE_ADDRESS) {

      if (peer_resolved_address.GetAddressType() ==

          AddressType::PUBLIC_DEVICE_ADDRESS) {

        peer_address_type = AddressType::PUBLIC_IDENTITY_ADDRESS;

      } else if (address.GetAddressType() ==

      } else if (peer_resolved_address.GetAddressType() ==

                 AddressType::RANDOM_DEVICE_ADDRESS) {

        peer_address_type = AddressType::RANDOM_IDENTITY_ADDRESS;

      } else {