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

Commit 46f670f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: No resolved address for random static" am: c10572fe am:... 

Merge "RootCanal: No resolved address for random static" am: c10572fe am: 2cc9cf44 am: c3fb3cd0 am: 87371ec0

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



Change-Id: Icc5270739a9a092407cdaffbf33b4b55140b7806
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9367d99e 87371ec0

tools/rootcanal/model/controller/link_layer_controller.cc

+2 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,8 @@ uint16_t LinkLayerController::HandleLeConnection( 
      connection_address = peer_resolved_address.GetAddress();

    }

    Address local_resolved_address = own_address.GetAddress();

    if (local_resolved_address == properties_.GetAddress()) {

    if (local_resolved_address == properties_.GetAddress() ||

        local_resolved_address == properties_.GetLeAddress()) {

      local_resolved_address = Address::kEmpty;

    }