Merge "Fix bug about checking privilege" into tizen
[platform/core/uifw/stt.git] / client / stt.c
index 9c7523d..163d67a 100644 (file)
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
+*  Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
@@ -12,6 +12,9 @@
 */
 
 #include <aul.h>
+#include <cynara-client.h>
+#include <cynara-error.h>
+#include <cynara-session.h>
 #include <dirent.h>
 #include <Ecore.h>
 #include <fcntl.h>
@@ -37,6 +40,9 @@ static float g_volume_db = 0;
 
 static int g_feature_enabled = -1;
 
+static int g_privilege_allowed = -1;
+static cynara *p_cynara = NULL;
+
 static bool g_err_callback_status = false;
 
 const char* stt_tag()
@@ -74,6 +80,80 @@ static int __stt_get_feature_enabled()
        return 0;
 }
 
+static int __check_privilege_initialize()
+{
+       int ret = cynara_initialize(&p_cynara, NULL);
+       if (CYNARA_API_SUCCESS != ret)
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to initialize");
+
+       return ret == CYNARA_API_SUCCESS;
+}
+
+static int __check_privilege(const char* uid, const char * privilege)
+{
+       FILE *fp = NULL;
+       char label_path[1024] = "/proc/self/attr/current";
+       char smack_label[1024] = {'\0',};
+
+       if (!p_cynara) {
+           return false;
+       }
+
+       fp = fopen(label_path, "r");
+       if (fp != NULL) {
+           if (fread(smack_label, 1, sizeof(smack_label), fp) <= 0)
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to fread");
+
+           fclose(fp);
+       }
+
+       pid_t pid = getpid();
+       char *session = cynara_session_from_pid(pid);
+       int ret = cynara_check(p_cynara, smack_label, session, uid, privilege);
+       SLOG(LOG_DEBUG, TAG_STTC, "[Client]cynara_check returned %d(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied");
+       if (session) {
+               free(session);
+               session = NULL;
+       }
+
+       if (ret != CYNARA_API_ACCESS_ALLOWED)
+           return false;
+       return true;
+}
+
+static void __check_privilege_deinitialize()
+{
+       if (p_cynara)
+               cynara_finish(p_cynara);
+       p_cynara = NULL;
+}
+
+static int __stt_check_privilege()
+{
+       char uid[16];
+
+       if (0 == g_privilege_allowed) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Permission is denied");
+               return STT_ERROR_PERMISSION_DENIED;
+       } else if (-1 == g_privilege_allowed) {
+               if (false == __check_privilege_initialize()) {
+                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] privilege initialize is failed");
+                       return STT_ERROR_PERMISSION_DENIED;
+               }
+               snprintf(uid, 16, "%d", getuid());
+               if (false == __check_privilege(uid, STT_PRIVILEGE)) {
+                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Permission is denied");
+                       g_privilege_allowed = 0;
+                       __check_privilege_deinitialize();
+                       return STT_ERROR_PERMISSION_DENIED;
+               }
+               __check_privilege_deinitialize();
+       }
+
+       g_privilege_allowed = 1;
+       return STT_ERROR_NONE;
+}
+
 static const char* __stt_get_error_code(stt_error_e err)
 {
        switch (err) {
@@ -91,6 +171,7 @@ static const char* __stt_get_error_code(stt_error_e err)
        case STT_ERROR_ENGINE_NOT_FOUND:        return "STT_ERROR_ENGINE_NOT_FOUND";
        case STT_ERROR_OPERATION_FAILED:        return "STT_ERROR_OPERATION_FAILED";
        case STT_ERROR_NOT_SUPPORTED_FEATURE:   return "STT_ERROR_NOT_SUPPORTED_FEATURE";
+       case STT_ERROR_SERVICE_RESET:           return "STT_ERROR_SERVICE_RESET";
        default:
                return "Invalid error code";
        }
@@ -166,16 +247,39 @@ void __stt_config_engine_changed_cb(const char* engine_id, const char* setting,
        if (NULL != client->engine_changed_cb) {
                client->engine_changed_cb(stt, engine_id, language, support_silence, need_credential, client->engine_changed_user_data);
        } else {
-               SLOG(LOG_WARN, TAG_STTC, "No registered callback function of supported languages");
+               SLOG(LOG_WARN, TAG_STTC, "No registered callback function for engine change");
        }
        return;
 }
 
+static int __stt_check_handle(stt_h stt, stt_client_s** client)
+{
+       if (NULL == stt) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       stt_client_s* temp = NULL;
+       temp = stt_client_get(stt);
+
+       /* check handle */
+       if (NULL == temp) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+       *client = temp;
+
+       return STT_ERROR_NONE;
+}
+
 int stt_create(stt_h* stt)
 {
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
 
        SLOG(LOG_DEBUG, TAG_STTC, "===== Create STT");
 
@@ -229,25 +333,19 @@ int stt_create(stt_h* stt)
 
 int stt_destroy(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Destroy STT");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Destroy STT");
+
        /* check used callback */
        if (0 != stt_client_get_use_callback(client)) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Cannot destroy in Callback function");
@@ -318,22 +416,21 @@ bool __stt_config_supported_engine_cb(const char* engine_id, const char* engine_
 
 int stt_foreach_supported_engines(stt_h stt, stt_supported_engine_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported engine");
-
-       if (NULL == stt || NULL == callback) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported engine");
 
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -363,22 +460,21 @@ int stt_foreach_supported_engines(stt_h stt, stt_supported_engine_cb callback, v
 
 int stt_get_engine(stt_h stt, char** engine_id)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Get current engine");
-
-       if (NULL == stt || NULL == engine_id) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Get current engine");
 
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == engine_id) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -411,22 +507,21 @@ int stt_get_engine(stt_h stt, char** engine_id)
 
 int stt_set_engine(stt_h stt, const char* engine_id)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Set current engine");
-
-       if (NULL == stt || NULL == engine_id) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Set current engine");
 
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == engine_id) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -438,8 +533,11 @@ int stt_set_engine(stt_h stt, const char* engine_id)
 
        if (NULL != client->current_engine_id) {
                free(client->current_engine_id);
+               client->current_engine_id = NULL;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== engined_id(%s)", engine_id);
+
        client->current_engine_id = strdup(engine_id);
 
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
@@ -450,22 +548,21 @@ int stt_set_engine(stt_h stt, const char* engine_id)
 
 int stt_set_credential(stt_h stt, const char* credential)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Set credential");
-
-       if (NULL == stt || NULL == credential) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL, stt(%s), credential(%a)", stt, credential);
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Set credential");
 
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == credential) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -475,6 +572,10 @@ int stt_set_credential(stt_h stt, const char* credential)
                return STT_ERROR_INVALID_STATE;
        }
 
+       if (NULL != client->credential) {
+               free(client->credential);
+               client->credential = NULL;
+       }
        client->credential = strdup(credential);
 
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
@@ -483,6 +584,114 @@ int stt_set_credential(stt_h stt, const char* credential)
        return STT_ERROR_NONE;
 }
 
+int stt_set_private_data(stt_h stt, const char* key, const char* data)
+{
+       stt_client_s* client = NULL;
+       if (0 != __stt_get_feature_enabled()) {
+               return STT_ERROR_NOT_SUPPORTED;
+       }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Set private data");
+
+       if (NULL == key || NULL == data) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid parameter");
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       /* check state */
+       if (STT_STATE_READY != client->current_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
+               return STT_ERROR_INVALID_STATE;
+       }
+
+       int ret = -1;
+       int count = 0;
+       while (0 != ret) {
+               ret = stt_dbus_request_set_private_data(client->uid, key, data);
+               if (0 != ret) {
+                       if (STT_ERROR_TIMED_OUT != ret) {
+                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to set private data : %s", __stt_get_error_code(ret));
+                               return ret;
+                       } else {
+                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry : %s", __stt_get_error_code(ret));
+                               usleep(10000);
+                               count++;
+                               if (STT_RETRY_COUNT == count) {
+                                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
+                                       return ret;
+                               }
+                       }
+               }
+       }
+
+       SLOG(LOG_DEBUG, TAG_STTC, "=====");
+       SLOG(LOG_DEBUG, TAG_STTC, "");
+
+       return STT_ERROR_NONE;
+
+}
+int stt_get_private_data(stt_h stt, const char* key, char** data)
+{
+       stt_client_s* client = NULL;
+       if (0 != __stt_get_feature_enabled()) {
+               return STT_ERROR_NOT_SUPPORTED;
+       }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Get private data");
+
+       if (NULL == key || NULL == data) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid parameter");
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       /* check state */
+       if (STT_STATE_READY != client->current_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
+               return STT_ERROR_INVALID_STATE;
+       }
+
+       int ret = -1;
+       int count = 0;
+       while (0 != ret) {
+               ret = stt_dbus_request_get_private_data(client->uid, key, data);
+               if (0 != ret) {
+                       if (STT_ERROR_TIMED_OUT != ret) {
+                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get private data : %s", __stt_get_error_code(ret));
+                               return ret;
+                       } else {
+                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry : %s", __stt_get_error_code(ret));
+                               usleep(10000);
+                               count++;
+                               if (STT_RETRY_COUNT == count) {
+                                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
+                                       return ret;
+                               }
+                       }
+               }
+       }
+
+       if (0 == strncmp(*data, "NULL", strlen(*data))) {
+               free(*data);
+               *data = NULL;
+       }
+
+       SLOG(LOG_DEBUG, TAG_STTC, "=====");
+       SLOG(LOG_DEBUG, TAG_STTC, "");
+
+       return STT_ERROR_NONE;
+}
 static Eina_Bool __stt_connect_daemon(void *data)
 {
        stt_client_s* client = (stt_client_s*)data;
@@ -506,7 +715,7 @@ static Eina_Bool __stt_connect_daemon(void *data)
        }
 
        g_connect_timer = NULL;
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Connect daemon");
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Connect stt-service");
 
        /* request initialization */
        bool silence_supported = false;
@@ -526,17 +735,20 @@ static Eina_Bool __stt_connect_daemon(void *data)
                SLOG(LOG_ERROR, TAG_STTC, "[WARNING] Fail to connection. Retry to connect");
                return EINA_TRUE;
        } else {
-               /* success to connect stt-daemon */
+               /* success to connect stt-service */
                client->silence_supported = silence_supported;
                client->credential_needed = credential_needed;
                SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s), credential(%s)", silence_supported ? "support" : "no support", credential_needed ? "need" : "no need");
        }
 
+#ifdef __UNUSED_CODES__
        if (NULL != client->current_engine_id) {
                ret = -1;
                int count = 0;
                silence_supported = false;
                credential_needed = false;
+               SLOG(LOG_DEBUG, TAG_STTC, "[WARNING] current_engine_id(%s)", client->current_engine_id);
+
                while (0 != ret) {
                        ret = stt_dbus_request_set_current_engine(client->uid, client->current_engine_id, &silence_supported, &credential_needed);
                        if (0 != ret) {
@@ -561,7 +773,7 @@ static Eina_Bool __stt_connect_daemon(void *data)
                        }
                }
        }
-
+#endif
        SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] uid(%d)", client->uid);
 
        client->before_state = client->current_state;
@@ -585,17 +797,14 @@ static Eina_Bool __stt_connect_daemon(void *data)
 
 int stt_prepare(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Prepare STT");
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -615,20 +824,19 @@ int stt_prepare(stt_h stt)
 
 int stt_unprepare(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Unprepare STT");
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Unprepare STT");
+
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", client->current_state);
@@ -702,22 +910,21 @@ bool __stt_config_supported_language_cb(const char* engine_id, const char* langu
 
 int stt_foreach_supported_languages(stt_h stt, stt_supported_language_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported Language");
-
-       if (NULL == stt || NULL == callback) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
+       SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported Language");
 
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -750,6 +957,7 @@ int stt_foreach_supported_languages(stt_h stt, stt_supported_language_cb callbac
 
        if (NULL != current_engine_id) {
                free(current_engine_id);
+               current_engine_id = NULL;
        }
 
        client->supported_lang_cb = NULL;
@@ -763,23 +971,24 @@ int stt_foreach_supported_languages(stt_h stt, stt_supported_language_cb callbac
 
 int stt_get_default_language(stt_h stt, char** language)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
 
        SLOG(LOG_DEBUG, TAG_STTC, "===== Get Default Language");
 
-       if (NULL == stt || NULL == language) {
+       if (NULL == language) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-
        int ret = 0;
        ret = stt_config_mgr_get_default_language(language);
        ret = __stt_convert_config_error_code(ret);
@@ -797,18 +1006,19 @@ int stt_get_default_language(stt_h stt, char** language)
 
 int stt_get_state(stt_h stt, stt_state_e* state)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == state) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
+       if (NULL == state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -827,11 +1037,18 @@ int stt_get_state(stt_h stt, stt_state_e* state)
 
 int stt_get_error_message(stt_h stt, char** err_msg)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       if (NULL == stt || NULL == err_msg) {
+       if (NULL == err_msg) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
@@ -841,12 +1058,6 @@ int stt_get_error_message(stt_h stt, char** err_msg)
                return STT_ERROR_OPERATION_FAILED;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get error msg : A handle is not valid");
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-
        if (NULL != client->err_msg) {
                *err_msg = strdup(client->err_msg);
                SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Error msg (%s)", *err_msg);
@@ -862,18 +1073,19 @@ int stt_get_error_message(stt_h stt, char** err_msg)
 
 int stt_is_recognition_type_supported(stt_h stt, const char* type, bool* support)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == type || NULL == support) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not valid");
+       if (NULL == type || NULL == support) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -911,18 +1123,14 @@ int stt_is_recognition_type_supported(stt_h stt, const char* type, bool* support
 
 int stt_set_silence_detection(stt_h stt, stt_option_silence_detection_e type)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -948,13 +1156,20 @@ int stt_set_silence_detection(stt_h stt, stt_option_silence_detection_e type)
 
 int stt_set_start_sound(stt_h stt, const char* filename)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
 
        SLOG(LOG_DEBUG, TAG_STTC, "===== STT SET START SOUND");
 
-       if (NULL == stt || NULL == filename) {
+       if (NULL == filename) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
@@ -964,12 +1179,6 @@ int stt_set_start_sound(stt_h stt, const char* filename)
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
@@ -1004,24 +1213,19 @@ int stt_set_start_sound(stt_h stt, const char* filename)
 
 int stt_unset_start_sound(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET START SOUND");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET START SOUND");
+
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
@@ -1056,13 +1260,20 @@ int stt_unset_start_sound(stt_h stt)
 
 int stt_set_stop_sound(stt_h stt, const char* filename)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
 
        SLOG(LOG_DEBUG, TAG_STTC, "===== STT SET STOP SOUND");
 
-       if (NULL == stt || NULL == filename) {
+       if (NULL == filename) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
@@ -1072,13 +1283,6 @@ int stt_set_stop_sound(stt_h stt, const char* filename)
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
@@ -1113,24 +1317,19 @@ int stt_set_stop_sound(stt_h stt, const char* filename)
 
 int stt_unset_stop_sound(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET STOP SOUND");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET STOP SOUND");
+
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
@@ -1165,23 +1364,19 @@ int stt_unset_stop_sound(stt_h stt)
 
 int stt_start(stt_h stt, const char* language, const char* type)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== STT START");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== STT START");
+
        /* check state */
        if (client->current_state != STT_STATE_READY) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
@@ -1190,7 +1385,7 @@ int stt_start(stt_h stt, const char* language, const char* type)
 
        if (STT_INTERNAL_STATE_NONE != client->internal_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
-               return STT_ERROR_INVALID_STATE;
+               return STT_ERROR_IN_PROGRESS_TO_RECORDING;
        }
 
        int ret = -1;
@@ -1210,54 +1405,6 @@ int stt_start(stt_h stt, const char* language, const char* type)
                temp = strdup(language);
        }
 
-#if 0
-       ret = -1;
-       /* do request */
-       int count = 0;
-       while (0 != ret) {
-               ret = stt_dbus_request_start(client->uid, temp, type, client->silence, appid);
-               if (0 > ret) {
-                       /* Failure */
-                       if (STT_ERROR_TIMED_OUT != ret) {
-                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to start : %s", __stt_get_error_code(ret));
-                               if (NULL != temp)       free(temp);
-                               return ret;
-                       } else {
-                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry to start");
-                               usleep(10000);
-                               count++;
-                               if (STT_RETRY_COUNT == count) {
-                                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
-                                       if (NULL != temp)       free(temp);
-                                       return ret;
-                               }
-                       }
-               } else {
-                       /* Success */
-                       if (NULL != temp)       free(temp);
-
-                       if (STT_RESULT_STATE_DONE == ret) {
-                               SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Start is done : %d", ret);
-                               client->before_state = client->current_state;
-                               client->current_state = STT_STATE_RECORDING;
-
-                               if (NULL != client->state_changed_cb) {
-                                       ecore_main_loop_thread_safe_call_async(__stt_notify_state_changed, client);
-                               } else {
-                                       SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
-                               }
-                       } else if (STT_RESULT_STATE_NOT_DONE == ret) {
-                               SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Start is not done : %d", ret);
-                               client->internal_state = STT_INTERNAL_STATE_STARTING;
-                       } else {
-                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid result : %d", ret);
-                       }
-
-                       ret = STT_ERROR_NONE;
-                       break;
-               }
-       }
-#else
        if (true == client->credential_needed && NULL == client->credential) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Do not have app credential for this engine(%s)", client->current_engine_id);
                return STT_ERROR_PERMISSION_DENIED;
@@ -1272,7 +1419,7 @@ int stt_start(stt_h stt, const char* language, const char* type)
        }
 
        if (NULL != temp)       free(temp);
-#endif
+
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
        SLOG(LOG_DEBUG, TAG_STTC, " ");
 
@@ -1281,85 +1428,45 @@ int stt_start(stt_h stt, const char* language, const char* type)
 
 int stt_stop(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== STT STOP");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== STT STOP");
+
        /* check state */
        if (client->current_state != STT_STATE_RECORDING) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Current state(%d) is NOT RECORDING", client->current_state);
                return STT_ERROR_INVALID_STATE;
        }
 
-       if (STT_INTERNAL_STATE_NONE != client->internal_state) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
-               return STT_ERROR_INVALID_STATE;
-       }
-#if 0
-       int ret = -1;
-       /* do request */
-       int count = 0;
-       while (0 != ret) {
-               ret = stt_dbus_request_stop(client->uid);
-               if (0 > ret) {
-                       /* Failure */
-                       if (STT_ERROR_TIMED_OUT != ret) {
-                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to stop : %s", __stt_get_error_code(ret));
-                               return ret;
-                       } else {
-                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry stop");
-                               usleep(10000);
-                               count++;
-                               if (STT_RETRY_COUNT == count) {
-                                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
-                                       return ret;
-                               }
-                       }
-               } else {
-                       if (STT_RESULT_STATE_DONE == ret) {
-                               SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is done : %d", ret);
-                               client->before_state = client->current_state;
-                               client->current_state = STT_STATE_PROCESSING;
-
-                               if (NULL != client->state_changed_cb) {
-                                       ecore_main_loop_thread_safe_call_async(__stt_notify_state_changed, client);
-                                       SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
-                               } else {
-                                       SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
-                               }
-                       } else if (STT_RESULT_STATE_NOT_DONE == ret) {
-                               SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is not done : %d", ret);
-                               client->internal_state = STT_INTERNAL_STATE_STOPING;
-                       } else {
-                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid result : %d", ret);
-                       }
-                       ret = STT_ERROR_NONE;
-                       break;
-               }
+       if (STT_INTERNAL_STATE_STARTING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STARTING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_RECORDING;
+       } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is CANCELING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_READY;
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STOPPING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_PROCESSING;
        }
-#else
+
        int ret = stt_dbus_request_stop(client->uid);
 
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to stop : %s", __stt_get_error_code(ret));
        } else {
                SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is successful but not done");
-               client->internal_state = STT_INTERNAL_STATE_STOPING;
+               client->internal_state = STT_INTERNAL_STATE_STOPPING;
        }
-#endif
+
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
        SLOG(LOG_DEBUG, TAG_STTC, " ");
 
@@ -1369,72 +1476,36 @@ int stt_stop(stt_h stt)
 
 int stt_cancel(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       SLOG(LOG_DEBUG, TAG_STTC, "===== STT CANCEL");
-
-       if (NULL == stt) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
-               return STT_ERROR_INVALID_PARAMETER;
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
        }
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
+       SLOG(LOG_DEBUG, TAG_STTC, "===== STT CANCEL");
+
        /* check state */
        if (STT_STATE_RECORDING != client->current_state && STT_STATE_PROCESSING != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid state : Current state(%d) is 'Ready'", client->current_state);
                return STT_ERROR_INVALID_STATE;
        }
 
-       if (STT_INTERNAL_STATE_NONE != client->internal_state) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
-               return STT_ERROR_INVALID_STATE;
+       if (STT_INTERNAL_STATE_STARTING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STARTING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_RECORDING;
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STOPPING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_PROCESSING;
+       } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is CANCELING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_READY;
        }
-#if 0
-       int ret = -1;
-       /* do request */
-       int count = 0;
-       while (0 != ret) {
-               ret = stt_dbus_request_cancel(client->uid);
-               if (0 != ret) {
-                       /* Failure */
-                       if (STT_ERROR_TIMED_OUT != ret) {
-                               SLOG(LOG_DEBUG, TAG_STTC, "[ERROR] Fail to cancel : %s", __stt_get_error_code(ret));
-                               return ret;
-                       } else {
-                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
-                               usleep(10000);
-                               count++;
-                               if (STT_RETRY_COUNT == count) {
-                                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
-                                       return ret;
-                               }
-                       }
-               } else {
-                       SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS]");
-
-                       client->before_state = client->current_state;
-                       client->current_state = STT_STATE_READY;
 
-                       if (NULL != client->state_changed_cb) {
-                               ecore_main_loop_thread_safe_call_async(__stt_notify_state_changed, client);
-                               SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
-                       } else {
-                               SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
-                       }
-                       ret = STT_ERROR_NONE;
-                       break;
-               }
-       }
-#else
        int ret = stt_dbus_request_cancel(client->uid);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to cancel : %s", __stt_get_error_code(ret));
@@ -1442,7 +1513,7 @@ int stt_cancel(stt_h stt)
                SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Cancel is successful but not done");
                client->internal_state = STT_INTERNAL_STATE_CANCELING;
        }
-#endif
+
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
        SLOG(LOG_DEBUG, TAG_STTC, " ");
 
@@ -1472,20 +1543,19 @@ int __stt_cb_set_volume(int uid, float volume)
 
 int stt_get_recording_volume(stt_h stt, float* volume)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == volume) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == volume) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -1524,9 +1594,16 @@ bool __stt_result_time_cb(int index, int event, const char* text, long start_tim
 
 int stt_foreach_detailed_result(stt_h stt, stt_result_time_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
+               return STT_ERROR_INVALID_PARAMETER;
+       }
 
        SLOG(LOG_DEBUG, TAG_STTC, "===== STT FOREACH DETAILED RESULT");
 
@@ -1535,14 +1612,6 @@ int stt_foreach_detailed_result(stt_h stt, stt_result_time_cb callback, void* us
                return STT_ERROR_INVALID_PARAMETER;
        }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail : A handle is not valid");
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-
        client->result_time_cb = callback;
        client->result_time_user_data = user_data;
 
@@ -1615,6 +1684,15 @@ int __stt_cb_error(int uid, int reason, char* err_msg)
                SLOG(LOG_WARN, TAG_STTC, "[WARNING] Error callback is null");
        }
 
+       if (STT_ERROR_SERVICE_RESET == reason) {
+               SLOG(LOG_WARN, TAG_STTC, "[WARNING] Service reset");
+
+               client->current_state = STT_STATE_CREATED;
+               if (0 != stt_prepare(client->stt)) {
+                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to prepare");
+               }
+       }
+
        return 0;
 }
 
@@ -1635,7 +1713,7 @@ static void __stt_notify_state_changed(void *data)
        if (STT_INTERNAL_STATE_STARTING == client->internal_state && STT_STATE_RECORDING == client->current_state) {
                client->internal_state = STT_INTERNAL_STATE_NONE;
                SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
-       } else if (STT_INTERNAL_STATE_STOPING == client->internal_state && STT_STATE_PROCESSING == client->current_state) {
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state && STT_STATE_PROCESSING == client->current_state) {
                client->internal_state = STT_INTERNAL_STATE_NONE;
                SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
        } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state && STT_STATE_READY == client->current_state) {
@@ -1797,20 +1875,19 @@ int __stt_cb_set_state(int uid, int state)
 
 int stt_set_recognition_result_cb(stt_h stt, stt_recognition_result_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (stt == NULL || callback == NULL)
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (callback == NULL)
                return STT_ERROR_INVALID_PARAMETER;
-       }
 
        if (STT_STATE_CREATED != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
@@ -1825,18 +1902,14 @@ int stt_set_recognition_result_cb(stt_h stt, stt_recognition_result_cb callback,
 
 int stt_unset_recognition_result_cb(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt)
-               return STT_ERROR_INVALID_PARAMETER;
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -1853,20 +1926,19 @@ int stt_unset_recognition_result_cb(stt_h stt)
 
 int stt_set_state_changed_cb(stt_h stt, stt_state_changed_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == callback)
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback)
                return STT_ERROR_INVALID_PARAMETER;
-       }
 
        if (STT_STATE_CREATED != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
@@ -1881,18 +1953,14 @@ int stt_set_state_changed_cb(stt_h stt, stt_state_changed_cb callback, void* use
 
 int stt_unset_state_changed_cb(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt)
-               return STT_ERROR_INVALID_PARAMETER;
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -1909,20 +1977,19 @@ int stt_unset_state_changed_cb(stt_h stt)
 
 int stt_set_error_cb(stt_h stt, stt_error_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == callback)
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback)
                return STT_ERROR_INVALID_PARAMETER;
-       }
 
        if (STT_STATE_CREATED != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
@@ -1937,18 +2004,14 @@ int stt_set_error_cb(stt_h stt, stt_error_cb callback, void* user_data)
 
 int stt_unset_error_cb(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt)
-               return STT_ERROR_INVALID_PARAMETER;
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -1965,20 +2028,19 @@ int stt_unset_error_cb(stt_h stt)
 
 int stt_set_default_language_changed_cb(stt_h stt, stt_default_language_changed_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == callback)
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback)
                return STT_ERROR_INVALID_PARAMETER;
-       }
 
        if (STT_STATE_CREATED != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
@@ -1993,18 +2055,14 @@ int stt_set_default_language_changed_cb(stt_h stt, stt_default_language_changed_
 
 int stt_unset_default_language_changed_cb(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt)
-               return STT_ERROR_INVALID_PARAMETER;
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -2021,20 +2079,19 @@ int stt_unset_default_language_changed_cb(stt_h stt)
 
 int stt_set_engine_changed_cb(stt_h stt, stt_engine_changed_cb callback, void* user_data)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt || NULL == callback)
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
+       }
 
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (NULL == callback)
                return STT_ERROR_INVALID_PARAMETER;
-       }
 
        if (STT_STATE_CREATED != client->current_state) {
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
@@ -2049,18 +2106,14 @@ int stt_set_engine_changed_cb(stt_h stt, stt_engine_changed_cb callback, void* u
 
 int stt_unset_engine_changed_cb(stt_h stt)
 {
+       stt_client_s* client = NULL;
        if (0 != __stt_get_feature_enabled()) {
                return STT_ERROR_NOT_SUPPORTED;
        }
-
-       if (NULL == stt)
-               return STT_ERROR_INVALID_PARAMETER;
-
-       stt_client_s* client = stt_client_get(stt);
-
-       /* check handle */
-       if (NULL == client) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+       if (0 != __stt_check_privilege()) {
+               return STT_ERROR_PERMISSION_DENIED;
+       }
+       if (0 != __stt_check_handle(stt, &client)) {
                return STT_ERROR_INVALID_PARAMETER;
        }