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

Commit 8747e3df authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Immediately execute instead of queueing request for LE service... 

Merge "Immediately execute instead of queueing request for LE service discovery if the static address matches that of the actively pairing device" am: 506d63e9 am: 43143d03 am: 6c583223 am: 19bc9e19 am: 7d1e2290

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

Change-Id: I20fbc0af08d44b35b0c262378ae26e345e65fa2c
parents 30e06a77 7d1e2290

system/btif/src/btif_dm.cc

+3 −1
Original line number Diff line number Diff line
@@ -2247,7 +2247,9 @@ void btif_dm_get_remote_services(RawAddress remote_addr, const int transport) { 
                   remote_addr.ToString().c_str());



  BTA_DmDiscover(remote_addr, btif_dm_search_services_evt, transport,

                 remote_addr != pairing_cb.bd_addr && is_bonding_or_sdp());

                 remote_addr != pairing_cb.bd_addr &&

                     remote_addr != pairing_cb.static_bdaddr &&

                     is_bonding_or_sdp());

}



void btif_dm_enable_service(tBTA_SERVICE_ID service_id, bool enable) {