Remove a privilege and an error

Change-Id: Iac7f00b4404ce077fc31778e9db6ca1fc304e9d4
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
(cherry picked from commit ab5024f6a410ea0684495488d2f9abdae13d2838)

diff --git a/include/voice_control_elm.h b/include/voice_control_elm.h
index 253bacc6b3cd1d318ccf68d93c9f07f3fc2eb23f..5b02ac81a3a69e019e41a44969b2a547868cf0d5 100644 (file)
--- a/include/voice_control_elm.h
+++ b/include/voice_control_elm.h
@@ -142,8 +142,6 @@ typedef bool (*vc_elm_action_cb)(const char* action, void* user_data);
 /**
 * @brief Initializes voice control elementary module.
 * @since_tizen @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif
-* @privlevel public
-* @privilege %http://tizen.org/privilege/recorder
 *
 * @remarks If the function succeeds, the voice control elementary must be released with vc_elm_deinitialize().
 *
@@ -152,7 +150,6 @@ typedef bool (*vc_elm_action_cb)(const char* action, void* user_data);
 * @retval #VC_ELM_ERROR_OUT_OF_MEMORY Out of memory
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @see vc_elm_deinitialize()
@@ -162,15 +159,12 @@ int vc_elm_initialize(void);
 /**
 * @brief Deinitializes voice control elementary module.
 * @since_tizen @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif
-* @privlevel public
-* @privilege %http://tizen.org/privilege/recorder
 *
 * @return 0 on success, otherwise a negative error value
 * @retval #VC_ELM_ERROR_NONE Successful
 * @retval #VC_ELM_ERROR_OUT_OF_MEMORY Out of memory
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @pre vc_elm_initialize() should be successful.

diff --git a/include/voice_control_elm_private.h b/include/voice_control_elm_private.h
index bb9a1daa6db9069437576eaf3c2d8c384d9e15fd..6077ad643f9f669dca3894c6fb5c32ea0d8e2662 100644 (file)
--- a/include/voice_control_elm_private.h
+++ b/include/voice_control_elm_private.h
@@ -31,7 +31,6 @@ extern "C" {
 /**
 * @brief Set auto command-register mode and click method for recognized object.
 * @since_tizen 3.0
-* @privilege %http://tizen.org/privilege/recorder
 *
 * @param[in] mode The mode of auto register
 * @param[in] click_method The click method for recognized object
@@ -40,7 +39,6 @@ extern "C" {
 * @retval #VC_ELM_ERROR_NONE Successful
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @pre vc_elm_initialize() should be successful.
@@ -52,7 +50,6 @@ int vc_elm_set_auto_register_mode(int mode, int click_method);
 /**
 * @brief Get auto command-register mode and click method for recognized object.
 * @since_tizen 3.0
-* @privilege %http://tizen.org/privilege/recorder
 *
 * @param[out] mode The mode of auto register
 * @param[out] click_method The click method for recognized object
@@ -61,7 +58,6 @@ int vc_elm_set_auto_register_mode(int mode, int click_method);
 * @retval #VC_ELM_ERROR_NONE Successful
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @pre vc_elm_initialize() should be successful.
@@ -73,7 +69,6 @@ int vc_elm_get_auto_register_mode(int* mode, int* click_method);
 /**
 * @brief Add allowed text part for auto command register.
 * @since_tizen 3.0
-* @privilege %http://tizen.org/privilege/recorder
 *
 * @param[in] text_part The text part of elemenatry widget
 *
@@ -82,7 +77,6 @@ int vc_elm_get_auto_register_mode(int* mode, int* click_method);
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_PARAMETER Invalid parameter
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @pre vc_elm_initialize() should be successful.
@@ -94,14 +88,12 @@ int vc_elm_add_allowed_text_part(const char* text_part);
 /**
 * @brief Remove the list of additional allowed text part for auto command register.
 * @since_tizen 3.0
-* @privilege %http://tizen.org/privilege/recorder
 *
 *
 * @return 0 on success, otherwise a negative error value
 * @retval #VC_ELM_ERROR_NONE Successful
 * @retval #VC_ELM_ERROR_OPERATION_FAILED Operation failed
 * @retval #VC_ELM_ERROR_INVALID_STATE Invalid state
-* @retval #VC_ELM_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ELM_ERROR_NOT_SUPPORTED Not supported
 *
 * @pre vc_elm_initialize() should be successful.

diff --git a/src/vc_elm.c b/src/vc_elm.c
index 6e396d3fc7fbdd458fc3b1c5466394f5492b2b0b..b89a39260ce9376f4a3748b0dc48731d8ecd9044 100644 (file)
--- a/src/vc_elm.c
+++ b/src/vc_elm.c
@@ -170,9 +170,6 @@ int vc_elm_initialize()
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (true == is_vc_elm_initialized) {
                VC_ELM_LOG_DBG("vc elm is already initialized");
@@ -201,9 +198,6 @@ int vc_elm_deinitialize()
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (false == is_vc_elm_initialized) {
                VC_ELM_LOG_DBG("vc elm is already deinitialized");
@@ -954,9 +948,6 @@ int vc_elm_set_auto_register_mode(int mode, int click_method)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        return _vc_elm_set_auto_register_mode(mode, click_method);
 }
@@ -966,9 +957,6 @@ int vc_elm_get_auto_register_mode(int* mode, int* click_method)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        return _vc_elm_get_auto_register_mode(mode, click_method);
 }
@@ -978,9 +966,6 @@ int vc_elm_add_allowed_text_part(const char* text_part)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (NULL == text_part) {
                VC_ELM_LOG_ERR("Invalid parameter");
@@ -999,9 +984,6 @@ int vc_elm_remove_allowed_text_part(void)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (0 != _vc_elm_core_remove_allowed_text_part()) {
                return VC_ELM_ERROR_OPERATION_FAILED;
@@ -1015,9 +997,6 @@ int vc_elm_set_geometry_info(int x, int y, int w, int h)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (0 != _vc_elm_core_set_geometry_info(x, y, w, h)) {
                return VC_ELM_ERROR_OPERATION_FAILED;
@@ -1031,9 +1010,6 @@ int vc_elm_unset_geometry_info()
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (0 != _vc_elm_core_unset_geometry_info()) {
                return VC_ELM_ERROR_OPERATION_FAILED;
@@ -1047,9 +1023,6 @@ int vc_elm_set_click_time(float time)
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (0 != _vc_elm_core_set_click_time(time)) {
                return VC_ELM_ERROR_OPERATION_FAILED;
@@ -1063,9 +1036,6 @@ int vc_elm_unset_click_time()
        if (0 != __vc_elm_get_feature_enabled()) {
                return VC_ELM_ERROR_NOT_SUPPORTED;
        }
-       if (0 != __vc_elm_check_privilege()) {
-               return VC_ELM_ERROR_PERMISSION_DENIED;
-       }
 
        if (0 != _vc_elm_core_unset_click_time()) {
                return VC_ELM_ERROR_OPERATION_FAILED;