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

Commit bcee4d3d authored by Jeremy Wu's avatar Jeremy Wu
Browse files

Floss: expose DBus method to notify HFP audio disconnection 

Currently there is no reliable way for the audio stack to learn if HFP
audio has been disconnected by the headset.

Through experiments, we have learned that in such case the headset is
almost always ready for reconnection, so it is critical to pass this
information for the audio stack to handle properly.

Bug: 241527929
Tag: #floss
Test: Build and verify DBus method exposed

Change-Id: I87f9842cd0a089e326caa5f4cfeeb74171a2a187
parent de31b5a2

system/gd/rust/linux/service/src/iface_bluetooth_media.rs

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ impl IBluetoothMediaCallback for BluetoothMediaCallbackDBus { 
    fn on_hfp_volume_changed(&self, volume: u8, addr: String) {

        dbus_generated!()

    }



    #[dbus_method("OnHfpAudioDisconnected")]

    fn on_hfp_audio_disconnected(&self, addr: String) {

        dbus_generated!()

    }

}



#[allow(dead_code)]

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

+9 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ pub trait IBluetoothMediaCallback: RPCProxy { 
    /// client to reflect the change on the audio stack. The volume should be

    /// in the range of 0 to 15.

    fn on_hfp_volume_changed(&self, volume: u8, addr: String);



    /// Triggered when HFP audio is disconnected, in which case it could be

    /// waiting for the audio client to issue a reconnection request. We need

    /// to notify audio client of this event for it to do appropriate handling.

    fn on_hfp_audio_disconnected(&self, addr: String);

}



/// Serializable device used in.
@@ -346,6 +351,10 @@ impl BluetoothMedia { 
                    }

                    BthfAudioState::Disconnected => {

                        info!("[{}]: hfp audio disconnected.", addr.to_string());



                        self.callbacks.lock().unwrap().for_all_callbacks(|callback| {

                            callback.on_hfp_audio_disconnected(addr.to_string());

                        });

                    }

                    BthfAudioState::Connecting => {

                        info!("[{}]: hfp audio connecting.", addr.to_string());