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

Commit 4c11bf1e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I3f609fe5,Ide5b514b,Ibe0a9880 into tm-dev am: 06de850d 

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



Change-Id: If446a4e4939f9f063398b8399f957478dbcc2bfb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38f70282 06de850d

tools/rootcanal/model/controller/link_layer_controller.cc

+3 −2
Original line number Diff line number Diff line
@@ -1584,9 +1584,10 @@ uint16_t LinkLayerController::HandleLeConnection(AddressWithType address, 
    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 {