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

Commit 35e01983 authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "floss: signal audio disconnection on device removal" into main am: dbbb1730 

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



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

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

+13 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,12 @@ impl BluetoothMedia { 
                    BtavConnectionState::Disconnected => {

                        info!("[{}]: a2dp disconnected.", DisplayAddress(&addr));



                        if self.a2dp_audio_connection_listener.is_some() {

                            let listener = self.a2dp_audio_connection_listener.take().unwrap();

                            let data: Vec<u8> = vec![0];

                            self.write_data_to_listener(listener, data);

                        }



                        self.a2dp_states.remove(&addr);

                        self.a2dp_caps.remove(&addr);

                        self.a2dp_audio_state.remove(&addr);
@@ -1484,6 +1490,13 @@ impl BluetoothMedia { 
                    }

                    BthfConnectionState::Disconnected => {

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



                        if self.hfp_audio_connection_listener.is_some() {

                            let listener = self.hfp_audio_connection_listener.take().unwrap();

                            let data: Vec<u8> = vec![0];

                            self.write_data_to_listener(listener, data);

                        }



                        self.uhid_destroy(&addr);

                        self.hfp_states.remove(&addr);

                        self.hfp_cap.remove(&addr);