Merge "Floss: |ack_stream_suspended| in all cases after setting command" (b11ff74e) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_a2dp_source.cc

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -710,8 +710,6 @@ void btif_a2dp_source_on_idle(void) {
	void btif_a2dp_source_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) {		void btif_a2dp_source_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) {
	LOG_INFO("%s: state=%s", __func__, btif_a2dp_source_cb.StateStr().c_str());		LOG_INFO("%s: state=%s", __func__, btif_a2dp_source_cb.StateStr().c_str());

	if (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateOff) return;

	// allow using this API for other (acknowledgement and stopping media task)		// allow using this API for other (acknowledgement and stopping media task)
	// than suspend		// than suspend
	if (p_av_suspend != nullptr && p_av_suspend->status != BTA_AV_SUCCESS) {		if (p_av_suspend != nullptr && p_av_suspend->status != BTA_AV_SUCCESS) {
	@@ -725,11 +723,13 @@ void btif_a2dp_source_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) {
	btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);		btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);
	}		}
	}		}
	} else if (btif_av_is_a2dp_offload_running()) {		} else {
	bluetooth::audio::a2dp::ack_stream_suspended(A2DP_CTRL_ACK_SUCCESS);		bluetooth::audio::a2dp::ack_stream_suspended(A2DP_CTRL_ACK_SUCCESS);
	return;		return;
	}		}

			if (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateOff) return;

	// ensure tx frames are immediately suspended		// ensure tx frames are immediately suspended
	btif_a2dp_source_cb.tx_flush = true;		btif_a2dp_source_cb.tx_flush = true;
	// ensure tx frames are immediately flushed		// ensure tx frames are immediately flushed