Merge "Floss: propagate HFP audio disconnection with state validation" (0f2128ec) · Commits · e / os / android_packages_modules_Bluetooth

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -538,14 +538,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());
		}
		@@ -553,8 +560,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\| {