From: saerome.kim Date: Wed, 28 Mar 2018 10:17:10 +0000 (+0900) Subject: capi: disable feature check routine temporally. X-Git-Tag: submit/tizen/20190131.065036~77 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ef2b819ca12213f4ee7974a7059dd8d3c8d7d70;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git capi: disable feature check routine temporally. Signed-off-by: saerome.kim --- diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt index b5e0f05..683a370 100644 --- 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 79677b0..41e5372 100644 --- 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 c0f8256..44c8a8c 100644 --- 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 745e3c4..accf31a 100644 --- 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 4ace0d7..a43bda4 100644 --- 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;