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

Commit 87371ec0 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

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



Change-Id: I4d5530bbb0c2e86951fbc4a8ccf265631a29a3f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9affc9f9 c3fb3cd0
Loading
Loading
Loading
Loading
+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;
    }