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

Commit 7d1e2290 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

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

Change-Id: I4a596453d644698d5dee5bbb65a41e7b2326c4e4
parents ba8f156f 19bc9e19

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) {