capi: disable feature check routine temporally.

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index b5e0f05c3253f5d850bcf17e1ea497e54e3556bd..683a370fab11b38d483d69200248f7721b73ba79 100644 (file)
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 SET(SOURCES src/companion.c
             src/companion_gdbus.c
-                       src/companion_util.c
+            src/companion_util.c
             src/companion_dbus.c)
 
 ADD_LIBRARY(${CAPI_FN} SHARED ${SOURCES})

diff --git a/capi/demo/main.c b/capi/demo/main.c
index 79677b0f11f7e316e645267416d943931218dc71..41e5372dcc6734b4370c5d4889949d94b94f1363 100644 (file)
--- a/capi/demo/main.c
+++ b/capi/demo/main.c
@@ -44,6 +44,17 @@ const char* comp_error_to_string(comp_error_e err)
        switch (err) {
        /* CHECK: List all enum values here */
        CASE_TO_STR(COMP_ERROR_NONE)
+       CASE_TO_STR(COMP_ERROR_IO_ERROR)
+       CASE_TO_STR(COMP_ERROR_INVALID_PARAMETER)
+       CASE_TO_STR(COMP_ERROR_OUT_OF_MEMORY)
+       CASE_TO_STR(COMP_ERROR_PERMISSION_DENIED)
+       CASE_TO_STR(COMP_ERROR_NOT_SUPPORTED)
+       CASE_TO_STR(COMP_ERROR_COMM_ERROR)
+       CASE_TO_STR(COMP_ERROR_RX)
+       CASE_TO_STR(COMP_ERROR_TX)
+       CASE_TO_STR(COMP_ERROR_OPERATION_FAILED)
+       CASE_TO_STR(COMP_ERROR_ALREADY_IN_PROGRESS)
+       CASE_TO_STR(COMP_ERROR_ALREADY_INITIALIZED)
        default :
                return "COMP_ERROR_GENERAL";
        }

diff --git a/capi/src/companion_private.h b/capi/src/companion_private.h
index c0f82563e44b618a0cca2850ebc16bc7a1978885..44c8a8c885f047c89dbfbb514dd5844f61679b98 100644 (file)
--- a/capi/src/companion_private.h
+++ b/capi/src/companion_private.h
@@ -34,7 +34,7 @@
                return COMP_ERROR_INVALID_PARAMETER; \
        }
 
-#if 1
+#if 0
 #define CHECK_FEATURE_SUPPORTED(feature_name) { \
        bool comp_supported = FALSE; \
        if (!system_info_get_platform_bool(feature_name, &comp_supported)) { \

diff --git a/src/companion-manager/src/comp_group.c b/src/companion-manager/src/comp_group.c
index 745e3c410369c707dc25bd0c49bd0cdb545f017f..accf31a600e69ed37e69516e9b5f3ef53e887829 100644 (file)
--- a/src/companion-manager/src/comp_group.c
+++ b/src/companion-manager/src/comp_group.c
@@ -370,7 +370,7 @@ int comp_group_get_mot_device_count()
 void comp_group_notify_mot_enable_device_done()
 {
        GVariant *device_data;
-       int count = g_list_length(mot_enb_dev_list);
+       int count = comp_group_get_mot_device_count();
 
        LOG_BEGIN();
 

diff --git a/src/companion-manager/src/comp_mot_agent.c b/src/companion-manager/src/comp_mot_agent.c
index 4ace0d7038b191d08cd9a319d49b484b77381406..a43bda4fe4a70aadec34cbb0a7e4ca567716c7c5 100644 (file)
--- a/src/companion-manager/src/comp_mot_agent.c
+++ b/src/companion-manager/src/comp_mot_agent.c
@@ -80,7 +80,7 @@ int agent_get_ownerid(char* deviceid)
 
 static gboolean _find_device_timeout_cb(gpointer data)
 {
-       int ret = -1;
+       int ret = COMP_ERROR_UNKNOWN;
 
        if (found_device_count > 0)
                ret = 0;