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

Commit 769035fa authored by Jeremy Wu's avatar Jeremy Wu
Browse files

Floss: propagate HFP audio disconnection with state validation 

It has been observed that in some cases, the audio state callback for
HFP could be notified of disconnection before it was ever connected, and
then be notified of connection following after.

Within these two state callbacks, the audio stack may be confused and
ask for reconnection, causing state de-sync.

In this CL, we do not propagate the audio disconnection event to the
audio stack unless it is a meaningful state transition (i.e., connected
-> disconnected).

Bug: 260618573
Tag: #floss
Test: Build and verify

Change-Id: I033abde1bded53a8c7366a961daa6888a1e5b9b3
parent 60a1768c

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

+10 −5
Original line number Diff line number Diff line
@@ -534,14 +534,21 @@ impl BluetoothMedia { 
                match state {

                    BthfAudioState::Connected => {

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



                        self.hfp_audio_state.insert(addr, state);

                    }

                    BthfAudioState::Disconnected => {

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



                        // Ignore disconnected -> disconnected

                        if let Some(BthfAudioState::Connected) =

                            self.hfp_audio_state.insert(addr, state)

                        {

                            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());

                    }
@@ -549,8 +556,6 @@ impl BluetoothMedia { 
                        info!("[{}]: hfp audio disconnecting.", addr.to_string());

                    }

                }



                self.hfp_audio_state.insert(addr, state);

            }

            HfpCallbacks::VolumeUpdate(volume, addr) => {

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