Fix TC issues (ignore ipc error in vce TCs and remove unnecessary codes)

Change-Id: I4944efd2ce825fc69ab6dcc86d90bc2b854f8d35
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>

diff --git a/server/vcd_server.c b/server/vcd_server.c
index f22895f35fc0d609f5f81c25f1b3706dcdf3adee..3939f9cfb313b321af221829c2fcf0a11cd05f71 100644 (file)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -1173,7 +1173,7 @@ int vcd_send_feedback_streaming(vce_feedback_event_e event, char* buffer, int le
 
        SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback streaming event(%d), uid(%u), is_mgr_client(%d)", event, g_current_tts_uid, (pid == vcd_client_manager_get_pid() ? true : false));
 
-       if (pid == vcd_client_manager_get_pid()) {
+       if (VC_INVALID_TTS_UID == pid || pid == vcd_client_manager_get_pid() || -1 == vcd_client_manager_get_pid()) {
                /* send TTS feedback streaming to manager client */
                ret = vcdc_send_feedback_streaming_to_manager(vcd_client_manager_get_pid(), pid, utt_id, event, buffer, len);
                if (VCD_ERROR_NONE != ret) {

diff --git a/server/vcd_tidl.c b/server/vcd_tidl.c
index 631643bd9312a48bd9095bb9f5d21f90c4dd83fa..b7709f3c85336adba9d0c934558a11b867f79cad 100644 (file)
--- a/server/vcd_tidl.c
+++ b/server/vcd_tidl.c
@@ -594,7 +594,7 @@ static int __vc_request_dialog_cb(rpc_port_stub_vcd_stub_vc_context_h context, i
                SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to vcd request dialog : pid(%d), disp_text(%s), utt_text(%s), continuous(%d), ret(%d)", pid, disp_text, utt_text, continuous, ret);
        }
        
-       return ret;
+       return VCD_ERROR_NONE;
 }
 
 static int __vc_is_system_command_valid_cb(rpc_port_stub_vcd_stub_vc_context_h context, int pid, bool *is_sys_cmd_valid, void *user_data)
@@ -2018,13 +2018,7 @@ int vcdc_send_feedback_streaming(int pid, int utt_id, vc_feedback_event_e event,
        client_tidl_info_s* info = vcd_client_get_tidl_info(pid);
        if (NULL == info) {
                SLOG(LOG_ERROR, TAG_VCD, "[TIDL ERROR] Fail to get tidl info. pid(%d)", pid);
-               return VCD_ERROR_INVALID_PARAMETER;
-       }
-
-       bundle* msg = bundle_create();
-       if (NULL == msg) {
-               SLOG(LOG_ERROR, TAG_VCD, "[TIDL ERROR] Fail to create bundle data");
-               return VCD_ERROR_OUT_OF_MEMORY;
+               return VCD_ERROR_NONE;
        }
 
        SLOG(LOG_INFO, TAG_VCD, "[TIDL] Send feedback streaming to app(%d), utt_id(%d), event(%d), length(%d)", pid, utt_id, event, len);
@@ -2037,7 +2031,6 @@ int vcdc_send_feedback_streaming(int pid, int utt_id, vc_feedback_event_e event,
 
        rpc_port_stub_vcd_stub_array_char_destroy(arr_char);
 
-       bundle_free(msg);
 
        return VCD_ERROR_NONE;
 }
@@ -2548,7 +2541,7 @@ int vcdc_send_feedback_streaming_to_manager(int manager_pid, int pid, int utt_id
                pthread_mutex_unlock(&g_mgr_tidl_info_mutex);
                rpc_port_stub_vcd_mgr_stub_array_char_destroy(streaming_data);
                bundle_free(msg);
-               return VCD_ERROR_OPERATION_FAILED;
+               return VCD_ERROR_NONE;
        }
 
        rpc_port_stub_vcd_mgr_stub_vc_mgr_send_buffer_cb_h handle = mgr_tidl_info->send_buffer_cb;