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

Commit 44229f58 authored by Archie Pusaka's avatar Archie Pusaka
Browse files

Floss: Check services_resolved against the changed property 

Previously we check services_resolved against the current property.
However, the current property might already have some other UUIDs
which are populated via advertisement.

This CL changed this behavior to check against the updated property
instead, this ensures we wait for SDP response before marking a
device as service_resolved.

Bug: 285098711
Test: Manually pair with BoseQC35, verify it immediately connect the
      profiles, despite receiving LE advertisements from the headset
      throughout the initial SDP process.
Change-Id: Iad6bd1667d80ed6f7c2f2e849b5bcc255c202b43
parent 80975f5a

system/gd/rust/linux/stack/src/bluetooth.rs

+10 −11
Original line number Diff line number Diff line
@@ -1554,19 +1554,18 @@ impl BtifBluetoothCallbacks for Bluetooth { 
                Bluetooth::send_metrics_remote_device_info(d);



                let info = d.info.clone();

                let has_uuids = d

                    .properties

                    .get(&BtPropertyType::Uuids)

                    .and_then(|prop| match prop {

                        BluetoothProperty::Uuids(uu) => Some(uu.len() > 0),

                        _ => None,

                    })

                    .map_or(false, |v| v);



                if !d.services_resolved {

                    let has_uuids = properties.iter().any(|prop| match prop {

                        BluetoothProperty::Uuids(uu) => uu.len() > 0,

                        _ => false,

                    });



                    // Services are resolved when uuids are fetched.

                d.services_resolved = has_uuids;

                    d.services_resolved |= has_uuids;

                }



                if d.wait_to_connect && has_uuids {

                if d.wait_to_connect && d.services_resolved {

                    d.wait_to_connect = false;



                    let sent_info = info.clone();