Merge "Include BTA_AV_INVALID_HANDLE as invalid handle of tBTA_AV_HANDLE" (b3515fbf) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_aact.cc

+7 −7

Original line number	Diff line number	Diff line
		@@ -1893,11 +1893,11 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		if (p_scb->co_started) {
		if (bta_av_cb.offload_started_hndl == p_scb->hndl) {
		bta_av_vendor_offload_stop();
		bta_av_cb.offload_started_hndl = 0;
		bta_av_cb.offload_started_hndl = BTA_AV_INVALID_HANDLE;
		} else if (bta_av_cb.offload_start_pending_hndl == p_scb->hndl) {
		APPL_TRACE_WARNING("%s: Stop pending offload start command", __func__);
		bta_av_vendor_offload_stop();
		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		}

		bta_av_stream_chg(p_scb, false);
		@@ -2521,11 +2521,11 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		if (p_scb->co_started) {
		if (bta_av_cb.offload_started_hndl == p_scb->hndl) {
		bta_av_vendor_offload_stop();
		bta_av_cb.offload_started_hndl = 0;
		bta_av_cb.offload_started_hndl = BTA_AV_INVALID_HANDLE;
		} else if (bta_av_cb.offload_start_pending_hndl == p_scb->hndl) {
		APPL_TRACE_WARNING("%s: Stop pending offload start command", __func__);
		bta_av_vendor_offload_stop();
		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		}
		bta_av_stream_chg(p_scb, false);

		@@ -3019,7 +3019,7 @@ void offload_vendor_callback(tBTM_VSC_CMPL* param) {
		if (bta_av_cb.offload_start_pending_hndl) {
		APPL_TRACE_DEBUG("%s: VS_HCI_START_A2DP_MEDIA successful", __func__);
		bta_av_cb.offload_started_hndl = bta_av_cb.offload_start_pending_hndl;
		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		} else {
		LOG_INFO("%s: No pending start command due to AVDTP suspend immediately", __func__);
		}
		@@ -3032,7 +3032,7 @@ void offload_vendor_callback(tBTM_VSC_CMPL* param) {
		APPL_TRACE_DEBUG("%s: Offload failed for subopcode= %d", __func__,
		sub_opcode);
		if (param->opcode != VS_HCI_A2DP_OFFLOAD_STOP) {
		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		(*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, &value);
		}
		}
		@@ -3172,7 +3172,7 @@ void bta_av_offload_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		status = BTA_AV_FAIL_STREAM;
		}

		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		tBTA_AV bta_av_data;
		bta_av_data.status = status;
		(*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, &bta_av_data);

system/bta/av/bta_av_main.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -166,8 +166,8 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) {
		/* store parameters */
		bta_av_cb.p_cback = p_data->api_enable.p_cback;
		bta_av_cb.features = p_data->api_enable.features;
		bta_av_cb.offload_start_pending_hndl = 0;
		bta_av_cb.offload_started_hndl = 0;
		bta_av_cb.offload_start_pending_hndl = BTA_AV_INVALID_HANDLE;
		bta_av_cb.offload_started_hndl = BTA_AV_INVALID_HANDLE;

		tBTA_AV_ENABLE enable;
		enable.features = bta_av_cb.features;

system/bta/include/bta_av_api.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ typedef uint8_t tBTA_AV_CHNL;
		typedef uint8_t tBTA_AV_HNDL;
		/* handle index to mask */
		#define BTA_AV_HNDL_TO_MSK(h) ((uint8_t)(1 << (h)))
		#define BTA_AV_INVALID_HANDLE 0x00

		/* maximum number of streams created */
		#ifndef BTA_AV_NUM_STRS