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

Commit fb790450 authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Force BR/EDR transport for retrying SDP service discovery 

If SDP service discovery fails after pairing, btif_dm requests service
disovery again but with "AUTO" transport. If the device properties do
not indicate that the device supports BR/EDR transport, LE transport may
be selected for the service discovery. In such case, pairing state never
resets as it keeps on waiting for the SDP service discovery to conclude.

Test: mma packages/modules/Bluetooth
Test: Manual | Pair with a dual mode device using RPA over LE transport,
keep the remote device non-discoverable and non-connectable over BR/EDR
transport

Bug: 326662585
Bug: 326656580
Change-Id: Ic64975db284bb485678d130dcdc34ee5434628c1
parent b0a7173e

system/btif/src/btif_dm.cc

+5 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,11 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
          LOG_WARN("SDP failed after bonding re-attempting for %s",

                   ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

          pairing_cb.sdp_attempts++;

          if (IS_FLAG_ENABLED(force_bredr_for_sdp_retry)) {

            btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR);

          } else {

            btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);

          }

        } else {

          LOG_WARN("SDP triggered by someone failed when bonding");

        }