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

Commit e3e13610 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Automerger Merge Worker
Browse files

Merge "floss: services are resolved when receiving uuids" am: 39a11b9e am:... 

Merge "floss: services are resolved when receiving uuids" am: 39a11b9e am: ae1f8377 am: a40dacac

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2462334



Change-Id: Ica5f3c443de5f7000cd51efb17e999d79cb3034a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eafee7e3 a40dacac

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1148,9 +1148,6 @@ impl BtifBluetoothCallbacks for Bluetooth { 
                d.update_properties(&properties);

                d.update_properties(&properties);

                d.seen();

                d.seen();





                // Services are resolved.

                d.services_resolved = true;



                Bluetooth::send_metrics_remote_device_info(d);

                Bluetooth::send_metrics_remote_device_info(d);





                let info = d.info.clone();

                let info = d.info.clone();
@@ -1163,6 +1160,9 @@ impl BtifBluetoothCallbacks for Bluetooth { 
                    })

                    })

                    .map_or(false, |v| v);

                    .map_or(false, |v| v);





                // Services are resolved when uuids are fetched.

                d.services_resolved = has_uuids;



                if d.wait_to_connect && has_uuids {

                if d.wait_to_connect && has_uuids {

                    d.wait_to_connect = false;

                    d.wait_to_connect = false;