From: Ji-hoon Lee Date: Thu, 10 Oct 2019 04:25:42 +0000 (+0900) Subject: Assume there is no assistant enabled when vconf key not found X-Git-Tag: submit/tizen/20191010.043147~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63291c2e92108c2e884f68487a0bad15d42955d7;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git Assume there is no assistant enabled when vconf key not found Change-Id: I7ab0c33805ba7995f3c50462b6762c3befae194b --- diff --git a/client/ma.c b/client/ma.c index edc3ebc..b7c516f 100644 --- a/client/ma.c +++ b/client/ma.c @@ -32,7 +32,7 @@ #define MAX_ASSISTANT_INFO_STR_LEN 128 #define MAX_ASSISTANT_NUM 10 -#define APPID_URL "db/multi-assistant/enabled_assistants" +#define ENABLED_ASSISTANTS_URL "db/multi-assistant/enabled_assistants" typedef struct{ char app_id[MAX_ASSISTANT_INFO_STR_LEN]; @@ -1489,16 +1489,18 @@ int ma_assistant_info_get_enabled_status(ma_assistant_info_h handle, bool* statu if (NULL == handle || NULL == status) return MA_ERROR_INVALID_PARAMETER; - char* appid = vconf_get_str(APPID_URL); - if (NULL == appid) { - return MA_ERROR_OPERATION_FAILED; + char* enabled_assistants = vconf_get_str(ENABLED_ASSISTANTS_URL); + if (NULL == enabled_assistants) { + /* No assistants enabled */ + *status = false; + return MA_ERROR_NONE; } assistant_info_t* info = (assistant_info_t*)handle; char id_buf[MAX_ASSISTANT_INFO_STR_LEN] = ""; - snprintf(id_buf, MAX_ASSISTANT_INFO_STR_LEN, "%s", appid); + snprintf(id_buf, MAX_ASSISTANT_INFO_STR_LEN, "%s", enabled_assistants); *status = __get_assistant_enable_status(info->app_id, id_buf); - free(appid); + free(enabled_assistants); return MA_ERROR_NONE; }