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

Commit 7ee7c0ee authored by Jeremy Wu's avatar Jeremy Wu
Browse files

Floss: add AvrcpController to connect/disconnect labels 

We suspect in some extreme cases only AvrcpController is exposed as
an available media profile, but the peripheral still manages to connect
to other profiles.

When the user disconnects the peripheral via UI,
`disconnect_all_enabled_profiles` is invoked. However, since
AvrcpController is not in the media labels, it will not propagate to the
media layer disconnect functions.

In this CL, we add AvrcpController to the labels (also on
`connect_all_enabled_profiles` for symmetry), and add a few logs to help
debugging around SDP.

Bug: 255990901
Tag: #floss
Test: Build and verify
Change-Id: I4f36de2358bf9509110192c26e6bff91371bbd1d
parent a80d0f65

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

+15 −2
Original line number Diff line number Diff line
@@ -1714,7 +1714,10 @@ impl IBluetooth for Bluetooth { 
                                }

                            }



                            Profile::A2dpSink | Profile::A2dpSource | Profile::Hfp => {

                            Profile::A2dpSink

                            | Profile::A2dpSource

                            | Profile::Hfp

                            | Profile::AvrcpController => {

                                let txl = self.tx.clone();

                                let address = device.address.clone();

                                topstack::get_runtime().spawn(async move {
@@ -1736,6 +1739,13 @@ impl IBluetooth for Bluetooth { 
        // If SDP isn't completed yet, we wait for it to complete and retry the connection again.

        // Otherwise, this connection request is done, no retry is required.

        self.wait_to_connect = !has_enabled_uuids;

        if self.wait_to_connect {

            warn!(

                "[{}] SDP hasn't completed for device, wait to connect.",

                addr.unwrap().to_string()

            );

        }



        return true;

    }
@@ -1771,7 +1781,10 @@ impl IBluetooth for Bluetooth { 
                                self.hh.as_ref().unwrap().disconnect(&mut addr.unwrap());

                            }



                            Profile::A2dpSink | Profile::A2dpSource | Profile::Hfp => {

                            Profile::A2dpSink

                            | Profile::A2dpSource

                            | Profile::Hfp

                            | Profile::AvrcpController => {

                                let txl = self.tx.clone();

                                let address = device.address.clone();

                                topstack::get_runtime().spawn(async move {