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 edc3ebcf8c7564c8fe5d7b730c7b250e8f8a9932..b7c516fdbf118534246b4e62727d4ea32df16080 100644 (file)
--- 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;
 }