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

Commit 2fbe9876 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btm_sec: Use LE when the address type isn't public" am: c7ba9f6b am:... 

Merge "btm_sec: Use LE when the address type isn't public" am: c7ba9f6b am: d294888b am: 8f8aced5 am: fbc9fcfa am: b13a2f28

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1846529

Change-Id: Icf85d5a8ac94a3dd90af715cb040a269f48d0bd1
parents d3e917d5 b13a2f28

system/stack/btm/btm_sec.cc

+7 −1
Original line number Diff line number Diff line
@@ -878,7 +878,13 @@ tBTM_STATUS BTM_SecBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
  }



  if (transport == BT_TRANSPORT_AUTO) {

    transport = BTM_UseLeLink(bd_addr) ? BT_TRANSPORT_LE : BT_TRANSPORT_BR_EDR;

    if (addr_type == BLE_ADDR_PUBLIC) {

      transport =

          BTM_UseLeLink(bd_addr) ? BT_TRANSPORT_LE : BT_TRANSPORT_BR_EDR;

    } else {

      LOG_INFO("Forcing transport LE (was auto) because of the address type");

      transport = BT_TRANSPORT_LE;

    }

  }

  tBT_DEVICE_TYPE dev_type;