Add error log messages for A2DP commands (c00e0337) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_a2dp_hw/audio_a2dp_hw.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -358,15 +358,19 @@ static int a2dp_command(struct a2dp_stream_common *common, char cmd)
		}

		/* wait for ack byte */
		if (a2dp_ctrl_receive(common, &ack, 1) < 0)
		if (a2dp_ctrl_receive(common, &ack, 1) < 0) {
		ERROR("A2DP COMMAND %s: no ACK", dump_a2dp_ctrl_event(cmd));
		return -1;
		}

		DEBUG("A2DP COMMAND %s DONE STATUS %d", dump_a2dp_ctrl_event(cmd), ack);

		if (ack == A2DP_CTRL_ACK_INCALL_FAILURE)
		return ack;
		if (ack != A2DP_CTRL_ACK_SUCCESS)
		if (ack != A2DP_CTRL_ACK_SUCCESS) {
		ERROR("A2DP COMMAND %s error %d", dump_a2dp_ctrl_event(cmd), ack);
		return -1;
		}

		return 0;
		}

system/btif/src/btif_media_task.cc

+19 −5

Original line number	Diff line number	Diff line
		@@ -558,6 +558,8 @@ static void btif_recv_ctrl_data(void)

		if (media_task_running == MEDIA_TASK_STATE_SHUTTING_DOWN)
		{
		APPL_TRACE_WARNING("%s: A2DP command %s while media task shutting down",
		__func__, dump_a2dp_ctrl_event(cmd));
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		return;
		}
		@@ -569,6 +571,8 @@ static void btif_recv_ctrl_data(void)
		}
		else
		{
		APPL_TRACE_WARNING("%s: A2DP command %s while AV stream is not ready",
		__func__, dump_a2dp_ctrl_event(cmd));
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		}
		break;
		@@ -585,8 +589,8 @@ static void btif_recv_ctrl_data(void)

		if (alarm_is_scheduled(btif_media_cb.media_alarm))
		{
		APPL_TRACE_WARNING("%s Unexpected HAL start."
		"Stream already in started state", __func__);
		APPL_TRACE_WARNING("%s: A2DP command %s when media alarm already scheduled",
		__func__, dump_a2dp_ctrl_event(cmd));
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		break;
		}
		@@ -614,6 +618,8 @@ static void btif_recv_ctrl_data(void)
		}
		else
		{
		APPL_TRACE_WARNING("%s: A2DP command %s while AV stream is not ready",
		__func__, dump_a2dp_ctrl_event(cmd));
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		break;
		}
		@@ -1097,6 +1103,8 @@ BOOLEAN btif_a2dp_on_started(tBTA_AV_START *p_av, BOOLEAN pending_start)
		}
		else if (pending_start)
		{
		APPL_TRACE_WARNING("%s: A2DP start request failed: status = %d",
		__func__, p_av->status);
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		ack = TRUE;
		}
		@@ -1151,8 +1159,11 @@ void btif_a2dp_on_stopped(tBTA_AV_SUSPEND *p_av)
		{
		APPL_TRACE_EVENT("AV STOP FAILED (%d)", p_av->status);

		if (p_av->initiator)
		if (p_av->initiator) {
		APPL_TRACE_WARNING("%s: A2DP stop request failed: status = %d",
		__func__, p_av->status);
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		}
		return;
		}
		}
		@@ -1195,9 +1206,12 @@ void btif_a2dp_on_suspended(tBTA_AV_SUSPEND *p_av)
		/* check for status failures */
		if (p_av->status != BTA_AV_SUCCESS)
		{
		if (p_av->initiator == TRUE)
		if (p_av->initiator == TRUE) {
		APPL_TRACE_WARNING("%s: A2DP suspend request failed: status = %d",
		__func__, p_av->status);
		a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
		}
		}

		/* once stream is fully stopped we will ack back */

		@@ -1233,7 +1247,7 @@ void btif_a2dp_on_offload_started(tBTA_AV_STATUS status)
		ack = A2DP_CTRL_ACK_UNSUPPORTED;
		break;
		default:
		APPL_TRACE_ERROR("%s FAILED", __func__);
		APPL_TRACE_ERROR("%s FAILED: status = %d", __func__, status);
		ack = A2DP_CTRL_ACK_FAILURE;
		break;
		}