From: sungrae jo <seongrae.jo@samsung.com>
Date: Mon, 16 Mar 2020 09:59:05 +0000 (+0900)
Subject: Fixed int to vc_tts_utterance_status_e for vc_mgr_dbus_send_utterance_status
X-Git-Tag: submit/tizen/20200407.072912~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F227787%2F3;p=platform%2Fcore%2Fuifw%2Fvoice-control.git

Fixed int to vc_tts_utterance_status_e for vc_mgr_dbus_send_utterance_status

Change-Id: I7e043f8681c61d8763aeb296e26c643b2c4556fd
Signed-off-by: sungrae jo <seongrae.jo@samsung.com>
---

diff --git a/client/vc_mgr.c b/client/vc_mgr.c
index 53c8c32..e16ef72 100755
--- a/client/vc_mgr.c
+++ b/client/vc_mgr.c
@@ -4324,10 +4324,24 @@ int vc_mgr_stop_feedback(void)
 	return ret;
 }
 
-int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status)
+int vc_mgr_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e utt_status)
 {
 	SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] send utterance status, pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status);
 
+	if (0 != __vc_mgr_get_feature_enabled()) {
+		SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported");
+		return VC_ERROR_NOT_SUPPORTED;
+	}
+
+	if (0 != __vc_mgr_check_privilege()) {
+		return VC_ERROR_PERMISSION_DENIED;
+	}
+
+	if (VC_TTS_UTTERANCE_NONE > utt_status || VC_TTS_UTTERANCE_CANCELED < utt_status) {
+		SLOG(LOG_ERROR, TAG_VCM, "[ERROR] utt_status is not valid. (%d)", utt_status);
+		return VC_ERROR_INVALID_PARAMETER;
+	}
+
 	vc_state_e state;
 	if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) {
 		SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available");
@@ -4352,15 +4366,13 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status)
 	}
 
 	int ret = vc_mgr_dbus_send_utterance_status(pid, utt_id, utt_status);
-	if (0 != ret) {
+	if (0 != ret)
 		SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to send utterance status : %s", __vc_mgr_get_error_code(ret));
-		return ret;
-	} else {
+	else
 		SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Send utterance status");
-	}
-	SLOG(LOG_DEBUG, TAG_VCM, "@@@");
 
-	return 0;
+	SLOG(LOG_DEBUG, TAG_VCM, "@@@");
+	return ret;
 }
 
 static float __get_volume_decibel(char* data, int size)
diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c
index eb6d62e..f9a5493 100755
--- a/client/vc_mgr_dbus.c
+++ b/client/vc_mgr_dbus.c
@@ -2269,7 +2269,7 @@ int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id,
 	return 0;
 }
 
-int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status)
+int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e utt_status)
 {
 	if (0 != __dbus_check()) {
 		return VC_ERROR_OPERATION_FAILED;
diff --git a/client/vc_mgr_dbus.h b/client/vc_mgr_dbus.h
index e0f5942..7d706f1 100644
--- a/client/vc_mgr_dbus.h
+++ b/client/vc_mgr_dbus.h
@@ -72,7 +72,7 @@ int vc_mgr_dbus_request_start_feedback(int pid);
 
 int vc_mgr_dbus_request_stop_feedback(int pid);
 
-int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status);
+int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e utt_status);
 
 int vc_mgr_dbus_send_audio_streaming(int pid, vc_audio_streaming_event_e event, unsigned char* buffer, unsigned int len);
 
diff --git a/include/voice_control_common.h b/include/voice_control_common.h
index 136e628..f8ca800 100644
--- a/include/voice_control_common.h
+++ b/include/voice_control_common.h
@@ -138,7 +138,7 @@ typedef enum {
  * @since_tizen 5.5
  */
 typedef enum {
-	VC_TTS_UTTERANCE_NONE = -1,	/**< None */
+	VC_TTS_UTTERANCE_NONE = 0,	/**< None */
 	VC_TTS_UTTERANCE_STARTED = 1,	/**< Utterance started */
 	VC_TTS_UTTERANCE_COMPLETED = 2,	/**< Utterance completed */
 	VC_TTS_UTTERANCE_CANCELED = 3	/**< Utterance canceled */