Remove Profile Build Dependency (TV)
[platform/core/api/connection.git] / src / connection.c
old mode 100644 (file)
new mode 100755 (executable)
index 0c057ef..e01c914
  * limitations under the License.
  */
 
+#include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 #include <vconf/vconf.h>
-#include "net_connection_private.h"
+#include <system_info.h>
 
-static GSList *conn_handle_list = NULL;
+#include "net_connection_private.h"
 
-static void __connection_cb_state_change_cb(keynode_t *node, void *user_data);
-static void __connection_cb_ip_change_cb(keynode_t *node, void *user_data);
-static void __connection_cb_proxy_change_cb(keynode_t *node, void *user_data);
+static __thread GSList *conn_handle_list = NULL;
+static int tv_profile = -1; // Unknown
 
+//LCOV_EXCL_START
 static int __connection_convert_net_state(int status)
 {
        switch (status) {
@@ -37,6 +38,8 @@ static int __connection_convert_net_state(int status)
                return CONNECTION_TYPE_ETHERNET;
        case VCONFKEY_NETWORK_BLUETOOTH:
                return CONNECTION_TYPE_BT;
+       case VCONFKEY_NETWORK_DEFAULT_PROXY:
+               return CONNECTION_TYPE_NET_PROXY;
        default:
                return CONNECTION_TYPE_DISCONNECTED;
        }
@@ -58,43 +61,69 @@ static int __connection_convert_cellular_state(int status)
        }
 }
 
-static int __connection_get_type_changed_callback_count(void)
+static bool __connection_check_handle_validity(connection_h connection)
 {
-       GSList *list;
-       int count = 0;
+       bool ret = false;
 
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->type_changed_callback) count++;
-       }
+       if (connection == NULL)
+               return false;
 
-       return count;
+       if (g_slist_find(conn_handle_list, connection) != NULL)
+               ret = true;
+
+       return ret;
 }
 
-static int __connection_get_ip_changed_callback_count(void)
+static connection_type_changed_cb
+__connection_get_type_changed_callback(connection_handle_s *local_handle)
 {
-       GSList *list;
-       int count = 0;
+       return local_handle->type_changed_callback;
+}
 
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->ip_changed_callback) count++;
-       }
+static void *__connection_get_type_changed_userdata(
+                                                       connection_handle_s *local_handle)
+{
+       return local_handle->type_changed_user_data;
+}
 
-       return count;
+static gboolean __connection_cb_type_changed_cb_idle(gpointer user_data)
+{
+       int state, status;
+       void *data;
+       connection_type_changed_cb callback;
+       connection_handle_s *local_handle = (connection_handle_s *)user_data;
+
+       if (__connection_check_handle_validity((connection_h)local_handle) != true)
+               return FALSE;
+
+       if (vconf_get_int(VCONFKEY_NETWORK_STATUS, &status) != 0)
+               return FALSE;
+
+       state = __connection_convert_net_state(status);
+
+       callback = __connection_get_type_changed_callback(local_handle);
+       data = __connection_get_type_changed_userdata(local_handle);
+       if (callback)
+               callback(state, data);
+
+       return FALSE;
 }
 
-static int __connection_get_proxy_changed_callback_count(void)
+static void __connection_cb_type_change_cb(keynode_t *node, void *user_data)
 {
        GSList *list;
-       int count = 0;
+       connection_h handle;
 
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->proxy_changed_callback) count++;
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
        }
 
-       return count;
+       for (list = conn_handle_list; list; list = list->next) {
+               handle = (connection_h)list->data;
+               _connection_callback_add(__connection_cb_type_changed_cb_idle, (gpointer)handle);
+       }
 }
 
 static void __connection_cb_ethernet_cable_state_changed_cb(connection_ethernet_cable_state_e state)
@@ -127,134 +156,222 @@ static int __connection_get_ethernet_cable_state_changed_callback_count(void)
 static int __connection_set_type_changed_callback(connection_h connection,
                                                        void *callback, void *user_data)
 {
-       connection_handle_s *local_handle = (connection_handle_s *)connection;
+       static __thread gint refcount = 0;
+       connection_handle_s *local_handle;
+
+       local_handle = (connection_handle_s *)connection;
 
        if (callback) {
-               if (__connection_get_type_changed_callback_count() == 0)
-                       if (vconf_notify_key_changed(VCONFKEY_NETWORK_STATUS ,
-                                       __connection_cb_state_change_cb, NULL))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+               if (refcount == 0)
+                       vconf_notify_key_changed(VCONFKEY_NETWORK_STATUS,
+                                       __connection_cb_type_change_cb, NULL);
 
-               local_handle->type_changed_user_data = user_data;
+               refcount++;
+               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
        } else {
-               if (local_handle->type_changed_callback &&
-                   __connection_get_type_changed_callback_count() == 1)
-                       if (vconf_ignore_key_changed(VCONFKEY_NETWORK_STATUS,
-                                       __connection_cb_state_change_cb))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+               if (refcount > 0 &&
+                               __connection_get_type_changed_callback(local_handle) != NULL) {
+                       if (--refcount == 0) {
+                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_STATUS,
+                                               __connection_cb_type_change_cb) < 0) {
+                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                                                       "Error to de-register vconf callback(%d)", refcount);
+                               } else {
+                                       CONNECTION_LOG(CONNECTION_INFO,
+                                                       "Successfully de-registered(%d)", refcount);
+                               }
+                       }
+               }
        }
 
+       local_handle->type_changed_user_data = user_data;
        local_handle->type_changed_callback = callback;
+
        return CONNECTION_ERROR_NONE;
 }
 
-static int __connection_set_ip_changed_callback(connection_h connection,
-                                                       void *callback, void *user_data)
+static connection_address_changed_cb
+__connection_get_ip_changed_callback(connection_handle_s *local_handle)
 {
-       connection_handle_s *local_handle = (connection_handle_s *)connection;
+       return local_handle->ip_changed_callback;
+}
 
-       if (callback) {
-               if (__connection_get_ip_changed_callback_count() == 0)
-                       if (vconf_notify_key_changed(VCONFKEY_NETWORK_IP,
-                                       __connection_cb_ip_change_cb, NULL))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+static void *__connection_get_ip_changed_userdata(
+                                                       connection_handle_s *local_handle)
+{
+       return local_handle->ip_changed_user_data;
+}
 
-               local_handle->ip_changed_user_data = user_data;
-       } else {
-               if (local_handle->ip_changed_callback &&
-                   __connection_get_ip_changed_callback_count() == 1)
-                       if (vconf_ignore_key_changed(VCONFKEY_NETWORK_IP,
-                                       __connection_cb_ip_change_cb))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+static gboolean __connection_cb_ip_changed_cb_idle(gpointer user_data)
+{
+       char *ip_addr;
+       void *data;
+       connection_address_changed_cb callback;
+       connection_handle_s *local_handle = (connection_handle_s *)user_data;
+
+       if (__connection_check_handle_validity((connection_h)local_handle) != true)
+               return FALSE;
+
+       ip_addr = vconf_get_str(VCONFKEY_NETWORK_IP);
+       if (ip_addr == NULL)
+               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                       "vconf_get_str(VCONFKEY_NETWORK_IP) is Failed");
+
+       callback = __connection_get_ip_changed_callback(local_handle);
+       data = __connection_get_ip_changed_userdata(local_handle);
+       /* TODO: IPv6 should be supported */
+       if (callback)
+               callback(ip_addr, NULL, data);
+
+       g_free(ip_addr);
+
+       return FALSE;
+}
+
+static void __connection_cb_ip_change_cb(keynode_t *node, void *user_data)
+{
+       GSList *list;
+       connection_h handle;
+
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
        }
 
-       local_handle->ip_changed_callback = callback;
-       return CONNECTION_ERROR_NONE;
+       for (list = conn_handle_list; list; list = list->next) {
+               handle = (connection_h)list->data;
+               _connection_callback_add(__connection_cb_ip_changed_cb_idle, (gpointer)handle);
+       }
 }
 
-static int __connection_set_proxy_changed_callback(connection_h connection,
+static int __connection_set_ip_changed_callback(connection_h connection,
                                                        void *callback, void *user_data)
 {
-       connection_handle_s *local_handle = (connection_handle_s *)connection;
+       static __thread gint refcount = 0;
+       connection_handle_s *local_handle;
+
+       local_handle = (connection_handle_s *)connection;
 
        if (callback) {
-               if (__connection_get_proxy_changed_callback_count() == 0)
-                       if (vconf_notify_key_changed(VCONFKEY_NETWORK_PROXY,
-                                       __connection_cb_proxy_change_cb, NULL))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+               if (refcount == 0)
+                       vconf_notify_key_changed(VCONFKEY_NETWORK_IP,
+                                       __connection_cb_ip_change_cb, NULL);
 
-               local_handle->proxy_changed_user_data = user_data;
+               refcount++;
+               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
        } else {
-               if (local_handle->proxy_changed_callback &&
-                   __connection_get_proxy_changed_callback_count() == 1)
-                       if (vconf_ignore_key_changed(VCONFKEY_NETWORK_PROXY,
-                                       __connection_cb_proxy_change_cb))
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+               if (refcount > 0 &&
+                               __connection_get_ip_changed_callback(local_handle) != NULL) {
+                       if (--refcount == 0) {
+                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_IP,
+                                               __connection_cb_ip_change_cb) < 0) {
+                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                                                       "Error to de-register vconf callback(%d)", refcount);
+                               } else {
+                                       CONNECTION_LOG(CONNECTION_INFO,
+                                                       "Successfully de-registered(%d)", refcount);
+                               }
+                       }
+               }
        }
 
-       local_handle->proxy_changed_callback = callback;
+       local_handle->ip_changed_user_data = user_data;
+       local_handle->ip_changed_callback = callback;
+
        return CONNECTION_ERROR_NONE;
 }
 
-static void __connection_cb_state_change_cb(keynode_t *node, void *user_data)
+static connection_address_changed_cb
+__connection_get_proxy_changed_callback(connection_handle_s *local_handle)
 {
-       CONNECTION_LOG(CONNECTION_INFO, "Net Status Changed Indication\n");
-
-       GSList *list;
-       int state = vconf_keynode_get_int(node);
+       return local_handle->proxy_changed_callback;
+}
 
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->type_changed_callback)
-                       local_handle->type_changed_callback(
-                                       __connection_convert_net_state(state),
-                                       local_handle->type_changed_user_data);
-       }
+static void *__connection_get_proxy_changed_userdata(
+                                                       connection_handle_s *local_handle)
+{
+       return local_handle->proxy_changed_user_data;
 }
 
-static void __connection_cb_ip_change_cb(keynode_t *node, void *user_data)
+static gboolean __connection_cb_proxy_changed_cb_idle(gpointer user_data)
 {
-       CONNECTION_LOG(CONNECTION_INFO, "Net IP Changed Indication\n");
+       char *proxy;
+       void *data;
+       connection_address_changed_cb callback;
+       connection_handle_s *local_handle = (connection_handle_s *)user_data;
 
-       GSList *list;
-       char *ip_addr = vconf_keynode_get_str(node);
+       if (__connection_check_handle_validity((connection_h)local_handle) != true)
+               return FALSE;
 
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->ip_changed_callback)
-                       local_handle->ip_changed_callback(
-                                       ip_addr, NULL,
-                                       local_handle->ip_changed_user_data);
-       }
+       proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
+       if (proxy == NULL)
+               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                       "vconf_get_str(VCONFKEY_NETWORK_PROXY) is Failed");
+
+       callback = __connection_get_proxy_changed_callback(local_handle);
+       data = __connection_get_proxy_changed_userdata(local_handle);
+       /* TODO: IPv6 should be supported */
+       if (callback)
+               callback(proxy, NULL, data);
+
+       g_free(proxy);
+
+       return FALSE;
 }
 
 static void __connection_cb_proxy_change_cb(keynode_t *node, void *user_data)
 {
-       CONNECTION_LOG(CONNECTION_INFO, "Net IP Changed Indication\n");
-
        GSList *list;
-       char *proxy = vconf_keynode_get_str(node);
+       connection_h handle;
+
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
+       }
 
        for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->proxy_changed_callback)
-                       local_handle->proxy_changed_callback(
-                                       proxy, NULL,
-                                       local_handle->proxy_changed_user_data);
+               handle = (connection_h)list->data;
+               _connection_callback_add(__connection_cb_proxy_changed_cb_idle, (gpointer)handle);
        }
 }
 
-static bool __connection_check_handle_validity(connection_h connection)
+static int __connection_set_proxy_changed_callback(connection_h connection,
+                                                       void *callback, void *user_data)
 {
-       bool ret = false;
+       static __thread gint refcount = 0;
+       connection_handle_s *local_handle;
 
-       if (connection == NULL)
-               return false;
+       local_handle = (connection_handle_s *)connection;
 
-       if (g_slist_find(conn_handle_list, connection) != NULL)
-               ret = true;
+       if (callback) {
+               if (refcount == 0)
+                       vconf_notify_key_changed(VCONFKEY_NETWORK_PROXY,
+                                       __connection_cb_proxy_change_cb, NULL);
 
-       return ret;
+               refcount++;
+               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
+       } else {
+               if (refcount > 0 &&
+                               __connection_get_proxy_changed_callback(local_handle) != NULL) {
+                       if (--refcount == 0) {
+                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_PROXY,
+                                               __connection_cb_proxy_change_cb) < 0) {
+                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                                                       "Error to de-register vconf callback(%d)", refcount);
+                               } else {
+                                       CONNECTION_LOG(CONNECTION_INFO,
+                                                       "Successfully de-registered(%d)", refcount);
+                               }
+                       }
+               }
+       }
+
+       local_handle->proxy_changed_user_data = user_data;
+       local_handle->proxy_changed_callback = callback;
+
+       return CONNECTION_ERROR_NONE;
 }
 
 static int __connection_set_ethernet_cable_state_changed_cb(connection_h connection,
@@ -276,68 +393,53 @@ static int __connection_set_ethernet_cable_state_changed_cb(connection_h connect
        local_handle->ethernet_cable_state_changed_user_data = user_data;
        return CONNECTION_ERROR_NONE;
 }
+//LCOV_EXCL_STOP
 
 static int __connection_get_handle_count(void)
 {
-       GSList *list;
-       int count = 0;
-
-       if (!conn_handle_list)
-               return count;
-
-       for (list = conn_handle_list; list; list = list->next) count++;
-
-       return count;
+       return ((int)g_slist_length(conn_handle_list));
 }
 
 /* Connection Manager ********************************************************/
-EXPORT_API int connection_create(connection_hconnection)
+EXPORT_API int connection_create(connection_h *connection)
 {
-       CONNECTION_MUTEX_LOCK;
-       int rv;
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (connection == NULL || __connection_check_handle_validity(*connection)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               CONNECTION_MUTEX_UNLOCK;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       rv = _connection_libnet_init();
+       int rv = _connection_libnet_init();
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               CONNECTION_MUTEX_UNLOCK;
-               return CONNECTION_ERROR_PERMISSION_DENIED;
-       }
-       else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to create connection[%d]", rv);
-               CONNECTION_MUTEX_UNLOCK;
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to create connection[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        *connection = g_try_malloc0(sizeof(connection_handle_s));
-       if (*connection != NULL) {
-               CONNECTION_LOG(CONNECTION_INFO, "New Handle Created %p\n", *connection);
-       } else {
-               CONNECTION_MUTEX_UNLOCK;
-               return CONNECTION_ERROR_OUT_OF_MEMORY;
-       }
+       if (*connection != NULL)
+               CONNECTION_LOG(CONNECTION_INFO, "New handle created[%p]", *connection);
+       else
+               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
 
-       conn_handle_list = g_slist_append(conn_handle_list, *connection);
+       conn_handle_list = g_slist_prepend(conn_handle_list, *connection);
 
-       CONNECTION_MUTEX_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_destroy(connection_h connection)
 {
-       CONNECTION_MUTEX_LOCK;
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
-       if (connection == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               CONNECTION_MUTEX_UNLOCK;
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       CONNECTION_LOG(CONNECTION_INFO, "Destroy Handle : %p\n", connection);
+       CONNECTION_LOG(CONNECTION_INFO, "Destroy handle: %p", connection);
 
        __connection_set_type_changed_callback(connection, NULL, NULL);
        __connection_set_ip_changed_callback(connection, NULL, NULL);
@@ -347,29 +449,35 @@ EXPORT_API int connection_destroy(connection_h connection)
        conn_handle_list = g_slist_remove(conn_handle_list, connection);
 
        g_free(connection);
+       connection = NULL;
 
-       if (__connection_get_handle_count() == 0)
+       if (__connection_get_handle_count() == 0) {
                _connection_libnet_deinit();
+               _connection_callback_cleanup();
+       }
 
-       CONNECTION_MUTEX_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_type(connection_h connection, connection_type_e* type)
 {
+       int rv = 0;
        int status = 0;
 
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (type == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (vconf_get_int(VCONFKEY_NETWORK_STATUS, &status)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_int Failed = %d\n", status);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+       rv = vconf_get_int(VCONFKEY_NETWORK_STATUS, &status);
+       if (rv != VCONF_OK) {
+               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_int Failed = %d", status); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
-       CONNECTION_LOG(CONNECTION_INFO, "Connected Network = %d\n", status);
+       CONNECTION_LOG(CONNECTION_INFO, "Connected Network = %d", status);
 
        *type = __connection_convert_net_state(status);
 
@@ -379,27 +487,26 @@ EXPORT_API int connection_get_type(connection_h connection, connection_type_e* t
 EXPORT_API int connection_get_ip_address(connection_h connection,
                                connection_address_family_e address_family, char** ip_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (ip_address == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        switch (address_family) {
        case CONNECTION_ADDRESS_FAMILY_IPV4:
-               *ip_address = vconf_get_str(VCONFKEY_NETWORK_IP);
-               break;
        case CONNECTION_ADDRESS_FAMILY_IPV6:
-               CONNECTION_LOG(CONNECTION_ERROR, "Not supported yet\n");
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+               *ip_address = vconf_get_str(VCONFKEY_NETWORK_IP);
                break;
        default:
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        if (*ip_address == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed\n");
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED;//LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
@@ -408,27 +515,26 @@ EXPORT_API int connection_get_ip_address(connection_h connection,
 EXPORT_API int connection_get_proxy(connection_h connection,
                                connection_address_family_e address_family, char** proxy)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (proxy == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        switch (address_family) {
        case CONNECTION_ADDRESS_FAMILY_IPV4:
-               *proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
-               break;
        case CONNECTION_ADDRESS_FAMILY_IPV6:
-               CONNECTION_LOG(CONNECTION_ERROR, "Not supported yet\n");
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+               *proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
                break;
        default:
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        if (*proxy == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed\n");
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
@@ -439,6 +545,13 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
        FILE *fp;
        char buf[CONNECTION_MAC_INFO_LENGTH + 1];
 
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE, ETHERNET_FEATURE);
+
+       if (type == CONNECTION_TYPE_WIFI)
+               CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+       else if (type == CONNECTION_TYPE_ETHERNET) //LCOV_EXCL_LINE
+               CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE); //LCOV_EXCL_LINE
+
        if (mac_addr == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -446,29 +559,48 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
 
        switch (type) {
        case CONNECTION_TYPE_WIFI:
-               fp = fopen(WIFI_MAC_INFO_FILE, "r");
-               if (fp == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", WIFI_MAC_INFO_FILE);
-                       return CONNECTION_ERROR_OUT_OF_MEMORY;
+               if (__builtin_expect(tv_profile == -1, 0)) {
+                       char *profileName;
+                       system_info_get_platform_string("http://tizen.org/feature/profile", &profileName);
+                       if (*profileName == 't' || *profileName == 'T')
+                               tv_profile = 1;
+                       else
+                               tv_profile = 0;
+                       free(profileName);
                }
+               if (tv_profile == 1) {
+                       fp = fopen(WIFI_MAC_INFO_FILE, "r");
+                       if (fp == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+                       }
 
-               if (fgets(buf, sizeof(buf), fp) == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", WIFI_MAC_INFO_FILE);
-                       fclose(fp);
-                       return CONNECTION_ERROR_OPERATION_FAILED;
-               }
+                       if (fgets(buf, sizeof(buf), fp) == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
+                               fclose(fp); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED;
+                       }
 
-               CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf);
+                       CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf);
 
-               *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
-               if (*mac_addr == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed");
+                       *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
+                       if (*mac_addr == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed"); //LCOV_EXCL_LINE
+                               fclose(fp); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+                       }
+                       g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
                        fclose(fp);
-                       return CONNECTION_ERROR_OUT_OF_MEMORY;
+               } else {
+                       *mac_addr = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+
+                       if (*mac_addr == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get vconf from %s", VCONFKEY_WIFI_BSSID_ADDRESS); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+                       }
                }
-               g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
-               fclose(fp);
                break;
+       //LCOV_EXCL_START
        case CONNECTION_TYPE_ETHERNET:
                fp = fopen(ETHERNET_MAC_INFO_FILE, "r");
                if (fp == NULL) {
@@ -491,20 +623,21 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
                        return CONNECTION_ERROR_OUT_OF_MEMORY;
                }
 
-               g_strlcpy(*mac_addr, buf,CONNECTION_MAC_INFO_LENGTH + 1);
+               g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
                fclose(fp);
 
                break;
-       default:
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       //LCOV_EXCL_STOP
+       default :
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        /* Checking Invalid MAC Address */
-       if((strcmp(*mac_addr, "00:00:00:00:00:00") == 0) ||
+       if ((strcmp(*mac_addr, "00:00:00:00:00:00") == 0) ||
                        (strcmp(*mac_addr, "ff:ff:ff:ff:ff:ff") == 0)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "MAC Address(%s) is invalid", *mac_addr);
-               return CONNECTION_ERROR_INVALID_OPERATION;
+               CONNECTION_LOG(CONNECTION_ERROR, "MAC Address(%s) is invalid", *mac_addr); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_OPERATION; //LCOV_EXCL_LINE
        }
 
        CONNECTION_LOG(CONNECTION_INFO, "MAC Address %s", *mac_addr);
@@ -512,66 +645,100 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
        return CONNECTION_ERROR_NONE;
 }
 
+
 EXPORT_API int connection_get_cellular_state(connection_h connection, connection_cellular_state_e* state)
 {
+       int rv = 0;
        int status = 0;
        int cellular_state = 0;
+#if defined TIZEN_DUALSIM_ENABLE
+       int sim_id = 0;
+#endif
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (!vconf_get_int(VCONFKEY_NETWORK_CELLULAR_STATE, &status)) {
-               CONNECTION_LOG(CONNECTION_INFO, "Cellular = %d\n", status);
-               *state = __connection_convert_cellular_state(status);
+       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_STATE, &status);
+       if (rv != VCONF_OK) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get cellular state"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
 
-               if (*state == CONNECTION_CELLULAR_STATE_AVAILABLE) {
-                       if (vconf_get_int(VCONFKEY_DNET_STATE, &cellular_state)) {
-                               CONNECTION_LOG(CONNECTION_ERROR,
-                                               "vconf_get_int Failed = %d\n", cellular_state);
-                               return CONNECTION_ERROR_OPERATION_FAILED;
-                       }
+       CONNECTION_LOG(CONNECTION_INFO, "Cellular: %d", status);
+       *state = __connection_convert_cellular_state(status);
+
+       if (*state == CONNECTION_CELLULAR_STATE_AVAILABLE) {
+#if defined TIZEN_DUALSIM_ENABLE
+               rv = vconf_get_int(VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
+               if (rv != VCONF_OK) {
+                       CONNECTION_LOG(CONNECTION_ERROR,
+                                       "Failed to get default subscriber id", sim_id);
+                       return CONNECTION_ERROR_OPERATION_FAILED;
                }
 
-               CONNECTION_LOG(CONNECTION_INFO, "Connection state = %d\n", cellular_state);
+               switch (sim_id) {
+               case CONNECTION_CELLULAR_SUBSCRIBER_1:
+#endif
+                       rv = vconf_get_int(VCONFKEY_DNET_STATE, &cellular_state);
+#if defined TIZEN_DUALSIM_ENABLE
+                       break;
 
-               if (cellular_state == VCONFKEY_DNET_NORMAL_CONNECTED ||
-                   cellular_state == VCONFKEY_DNET_SECURE_CONNECTED ||
-                   cellular_state == VCONFKEY_DNET_TRANSFER)
-                       *state = CONNECTION_CELLULAR_STATE_CONNECTED;
+               case CONNECTION_CELLULAR_SUBSCRIBER_2:
+                       rv = vconf_get_int(VCONFKEY_DNET_STATE2, &cellular_state);
+                       break;
 
-               return CONNECTION_ERROR_NONE;
-       } else {
-               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_int Failed = %d\n", status);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               default:
+                       CONNECTION_LOG(CONNECTION_ERROR, "Invalid subscriber id:%d", sim_id);
+                       return CONNECTION_ERROR_OPERATION_FAILED;
+               }
+#endif
+               if (rv != VCONF_OK) {
+                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get cellular state"); //LCOV_EXCL_LINE
+                       return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+               }
        }
+
+       CONNECTION_LOG(CONNECTION_INFO, "Cellular state: %d", cellular_state);
+
+       if (cellular_state == VCONFKEY_DNET_NORMAL_CONNECTED ||
+                       cellular_state == VCONFKEY_DNET_SECURE_CONNECTED ||
+                       cellular_state == VCONFKEY_DNET_TRANSFER)
+               *state = CONNECTION_CELLULAR_STATE_CONNECTED;
+
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_wifi_state(connection_h connection, connection_wifi_state_e* state)
 {
-       int rv;
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       rv = _connection_libnet_get_wifi_state(state);
+       int rv = _connection_libnet_get_wifi_state(state);
        if (rv != CONNECTION_ERROR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get Wi-Fi state[%d]", rv);
-               return rv;
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get Wi-Fi state[%d]", rv); //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
-       CONNECTION_LOG(CONNECTION_INFO, "WiFi state = %d\n", *state);
+       CONNECTION_LOG(CONNECTION_INFO, "Wi-Fi state: %d", *state);
 
        return CONNECTION_ERROR_NONE;
 }
 
-EXPORT_API int connection_get_ethernet_state(connection_h connection, connection_ethernet_state_e* state)
+//LCOV_EXCL_START
+EXPORT_API int connection_get_ethernet_state(connection_h connection, connection_ethernet_state_e *state)
 {
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -580,6 +747,8 @@ EXPORT_API int connection_get_ethernet_state(connection_h connection, connection
 
 EXPORT_API int connection_get_ethernet_cable_state(connection_h connection, connection_ethernet_cable_state_e *state)
 {
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -591,6 +760,8 @@ EXPORT_API int connection_get_ethernet_cable_state(connection_h connection, conn
 EXPORT_API int connection_set_ethernet_cable_state_chaged_cb(connection_h connection,
                          connection_ethernet_cable_state_chaged_cb callback, void *user_data)
 {
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -602,7 +773,9 @@ EXPORT_API int connection_set_ethernet_cable_state_chaged_cb(connection_h connec
 
 EXPORT_API int connection_unset_ethernet_cable_state_chaged_cb(connection_h connection)
 {
-       if ( !(__connection_check_handle_validity(connection)) ) {
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
@@ -610,23 +783,27 @@ EXPORT_API int connection_unset_ethernet_cable_state_chaged_cb(connection_h conn
        return __connection_set_ethernet_cable_state_changed_cb(connection,
                                                        NULL, NULL);
 }
+//LCOV_EXCL_STOP
 
-EXPORT_API int connection_get_bt_state(connection_h connection, connection_bt_state_estate)
+EXPORT_API int connection_get_bt_state(connection_h connection, connection_bt_state_e *state)
 {
+       CHECK_FEATURE_SUPPORTED(TETHERING_BLUETOOTH_FEATURE);
+
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        return _connection_libnet_get_bluetooth_state(state);
-
 }
 
 EXPORT_API int connection_set_type_changed_cb(connection_h connection,
                                        connection_type_changed_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -635,8 +812,10 @@ EXPORT_API int connection_set_type_changed_cb(connection_h connection,
 
 EXPORT_API int connection_unset_type_changed_cb(connection_h connection)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -646,8 +825,10 @@ EXPORT_API int connection_unset_type_changed_cb(connection_h connection)
 EXPORT_API int connection_set_ip_address_changed_cb(connection_h connection,
                                connection_address_changed_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -656,8 +837,10 @@ EXPORT_API int connection_set_ip_address_changed_cb(connection_h connection,
 
 EXPORT_API int connection_unset_ip_address_changed_cb(connection_h connection)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -667,8 +850,10 @@ EXPORT_API int connection_unset_ip_address_changed_cb(connection_h connection)
 EXPORT_API int connection_set_proxy_address_changed_cb(connection_h connection,
                                connection_address_changed_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -677,8 +862,10 @@ EXPORT_API int connection_set_proxy_address_changed_cb(connection_h connection,
 
 EXPORT_API int connection_unset_proxy_address_changed_cb(connection_h connection)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -687,28 +874,36 @@ EXPORT_API int connection_unset_proxy_address_changed_cb(connection_h connection
 
 EXPORT_API int connection_add_profile(connection_h connection, connection_profile_h profile)
 {
+       int rv = 0;
+       net_profile_info_t *profile_info = profile;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            !(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       int rv = 0;
-
-       net_profile_info_t *profile_info = profile;
-
        if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_add_profile(profile_info->ProfileInfo.Pdp.ServiceType, (net_profile_info_t*)profile);
+       if (profile_info->ProfileInfo.Pdp.PSModemPath[0] != '/' ||
+                       strlen(profile_info->ProfileInfo.Pdp.PSModemPath) < 2) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Modem object path is NULL"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+       }
+
+       rv = net_add_profile(profile_info->ProfileInfo.Pdp.ServiceType,
+                                                       (net_profile_info_t*)profile);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
@@ -716,28 +911,30 @@ EXPORT_API int connection_add_profile(connection_h connection, connection_profil
 
 EXPORT_API int connection_remove_profile(connection_h connection, connection_profile_h profile)
 {
+       int rv = 0;
+       net_profile_info_t *profile_info = profile;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
-           !(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+                       !(_connection_libnet_check_profile_validity(profile))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       int rv = 0;
-       net_profile_info_t *profile_info = profile;
-
        if (profile_info->profile_type != NET_DEVICE_CELLULAR &&
            profile_info->profile_type != NET_DEVICE_WIFI) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv = net_delete_profile(profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to delete profile[%d]", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to delete profile[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
@@ -745,22 +942,24 @@ EXPORT_API int connection_remove_profile(connection_h connection, connection_pro
 
 EXPORT_API int connection_update_profile(connection_h connection, connection_profile_h profile)
 {
+       int rv = 0;
+       net_profile_info_t *profile_info = profile;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            !(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       int rv = 0;
-       net_profile_info_t *profile_info = profile;
-
        rv = net_modify_profile(profile_info->ProfileName, (net_profile_info_t*)profile);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to modify profile[%d]", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to modify profile[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
@@ -769,6 +968,8 @@ EXPORT_API int connection_update_profile(connection_h connection, connection_pro
 EXPORT_API int connection_get_profile_iterator(connection_h connection,
                connection_iterator_type_e type, connection_profile_iterator_h* profile_iterator)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            (type != CONNECTION_ITERATOR_TYPE_REGISTERED &&
             type != CONNECTION_ITERATOR_TYPE_CONNECTED &&
@@ -783,34 +984,45 @@ EXPORT_API int connection_get_profile_iterator(connection_h connection,
 EXPORT_API int connection_profile_iterator_next(connection_profile_iterator_h profile_iterator,
                                                        connection_profile_h* profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        return _connection_libnet_get_iterator_next(profile_iterator, profile);
 }
 
 EXPORT_API bool connection_profile_iterator_has_next(connection_profile_iterator_h profile_iterator)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        return _connection_libnet_iterator_has_next(profile_iterator);
 }
 
 EXPORT_API int connection_destroy_profile_iterator(connection_profile_iterator_h profile_iterator)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        return _connection_libnet_destroy_iterator(profile_iterator);
 }
 
 EXPORT_API int connection_get_current_profile(connection_h connection, connection_profile_h* profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        return _connection_libnet_get_current_profile(profile);
 }
 
-EXPORT_API int connection_get_default_cellular_service_profile(connection_h connection,
-               connection_cellular_service_type_e type, connection_profile_h* profile)
+EXPORT_API int connection_get_default_cellular_service_profile(
+               connection_h connection, connection_cellular_service_type_e type,
+               connection_profile_h *profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -820,8 +1032,10 @@ EXPORT_API int connection_get_default_cellular_service_profile(connection_h conn
 EXPORT_API int connection_set_default_cellular_service_profile(connection_h connection,
                connection_cellular_service_type_e type, connection_profile_h profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -832,9 +1046,11 @@ EXPORT_API int connection_set_default_cellular_service_profile_async(connection_
                connection_cellular_service_type_e type, connection_profile_h profile,
                connection_set_default_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -844,9 +1060,11 @@ EXPORT_API int connection_set_default_cellular_service_profile_async(connection_
 EXPORT_API int connection_open_profile(connection_h connection, connection_profile_h profile,
                                        connection_opened_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -856,9 +1074,11 @@ EXPORT_API int connection_open_profile(connection_h connection, connection_profi
 EXPORT_API int connection_close_profile(connection_h connection, connection_profile_h profile,
                                        connection_closed_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -868,14 +1088,16 @@ EXPORT_API int connection_close_profile(connection_h connection, connection_prof
 EXPORT_API int connection_reset_profile(connection_h connection,
                                connection_reset_option_e type, int id, connection_reset_cb callback, void *user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if(id < 0 || id > 1) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       if (id < 0 || id > 1) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        return _connection_libnet_reset_profile(type, id, callback, user_data);
@@ -883,9 +1105,11 @@ EXPORT_API int connection_reset_profile(connection_h connection,
 
 EXPORT_API int connection_add_route(connection_h connection, const char* interface_name, const char* host_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            interface_name == NULL || host_address == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -894,6 +1118,8 @@ EXPORT_API int connection_add_route(connection_h connection, const char* interfa
 
 EXPORT_API int connection_remove_route(connection_h connection, const char* interface_name, const char* host_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) ||
            interface_name == NULL || host_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
@@ -903,48 +1129,142 @@ EXPORT_API int connection_remove_route(connection_h connection, const char* inte
        return _connection_libnet_remove_route(interface_name, host_address);
 }
 
-/* Connection Statistics module ******************************************************************/
+EXPORT_API int connection_add_route_ipv6(connection_h connection, const char *interface_name, const char *host_address, const char * gateway)
+{
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
 
-static int __get_statistic(connection_type_e connection_type,
-                       connection_statistics_type_e statistics_type, long long* llsize)
+       if (!(__connection_check_handle_validity(connection)) ||
+           interface_name == NULL || host_address == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       return _connection_libnet_add_route_ipv6(interface_name, host_address, gateway);
+}
+
+EXPORT_API int connection_remove_route_ipv6(connection_h connection, const char *interface_name, const char *host_address, const char * gateway)
 {
-       int rv, size;
-       unsigned long long ull_size;
-       int stat_type;
-       char *key = NULL;
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection)) ||
+           interface_name == NULL || host_address == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       return _connection_libnet_remove_route_ipv6(interface_name, host_address, gateway);
+}
+
+static int __get_cellular_statistic(connection_statistics_type_e statistics_type, long long *llsize)
+{
+       int rv = VCONF_OK, rv1 = VCONF_OK;
+       int last_size = 0, size = 0;
+#if defined TIZEN_DUALSIM_ENABLE
+       int sim_id = 0;
+#endif
 
        if (llsize == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (connection_type == CONNECTION_TYPE_CELLULAR) {
+       switch (statistics_type) {
+       case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
+       case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:
+       case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:
+       case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:
+               break;
+       default:
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+#if defined TIZEN_DUALSIM_ENABLE
+       rv = vconf_get_int(VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
+       if (rv != VCONF_OK) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get default subscriber id");
+               *llsize = 0;
+               return CONNECTION_ERROR_OPERATION_FAILED;
+       }
+
+       switch (sim_id) {
+       case 0:
+#endif
                switch (statistics_type) {
                case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
-                       key = VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT;
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:
-                       key = VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV;
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:
-                       key = VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT;
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
+                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT, &size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:
-                       key = VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV;
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
+                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV, &size);
                        break;
-               default:
-                       return CONNECTION_ERROR_INVALID_PARAMETER;
                }
-
-               if (vconf_get_int(key, &size)) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Cannot Get %s = %d\n", key, size);
-                       *llsize = 0;
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+#if defined TIZEN_DUALSIM_ENABLE
+               break;
+       case 1:
+               switch (statistics_type) {
+               case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
+                       break;
+               case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
+                       break;
+               case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
+                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2, &size);
+                       break;
+               case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:
+                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
+                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2, &size);
+                       break;
                }
+               break;
+       default:
+               *llsize = 0;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid subscriber id:%d", sim_id);
+               return CONNECTION_ERROR_OPERATION_FAILED;
+       }
+#endif
 
-               CONNECTION_LOG(CONNECTION_INFO,"%s:%d bytes\n", key, size);
-               *llsize = (long long)size;
-       } else if (connection_type == CONNECTION_TYPE_WIFI) {
+       if (rv != VCONF_OK || rv1 != VCONF_OK) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get cellular statistics"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       *llsize = (long long)(last_size * 1000) + (long long)(size * 1000);
+       CONNECTION_LOG(CONNECTION_INFO, "%lld bytes", *llsize);
+
+       return CONNECTION_ERROR_NONE;
+}
+
+static int __get_statistic(connection_type_e connection_type,
+               connection_statistics_type_e statistics_type, long long *llsize)
+{
+       int rv, stat_type;
+       unsigned long long ull_size;
+
+       if (llsize == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       rv  = _connection_libnet_check_get_privilege();
+       if (rv == CONNECTION_ERROR_PERMISSION_DENIED)
+               return rv;
+       else if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get statistics"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED;
+       }
+
+       if (connection_type == CONNECTION_TYPE_CELLULAR)
+               return __get_cellular_statistic(statistics_type, llsize);
+       else if (connection_type == CONNECTION_TYPE_WIFI) {
                switch (statistics_type) {
                case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
                        stat_type = NET_STATISTICS_TYPE_LAST_SENT_DATA;
@@ -966,12 +1286,12 @@ static int __get_statistic(connection_type_e connection_type,
                if (rv == CONNECTION_ERROR_PERMISSION_DENIED)
                        return rv;
                else if (rv != CONNECTION_ERROR_NONE) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get Wi-Fi statistics");
-                       *llsize = 0;
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get Wi-Fi statistics"); //LCOV_EXCL_LINE
+                       *llsize = 0; //LCOV_EXCL_LINE
+                       return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
                }
 
-               CONNECTION_LOG(CONNECTION_INFO,"%d bytes\n", ull_size);
+               CONNECTION_LOG(CONNECTION_INFO, "%lld bytes", ull_size);
                *llsize = (long long)ull_size;
        } else
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -980,7 +1300,7 @@ static int __get_statistic(connection_type_e connection_type,
 }
 
 static int __reset_statistic(connection_type_e connection_type,
-                       connection_statistics_type_e statistics_type)
+               connection_statistics_type_e statistics_type)
 {
        int conn_type;
        int stat_type;
@@ -1011,11 +1331,10 @@ static int __reset_statistic(connection_type_e connection_type,
        }
 
        rv = _connection_libnet_set_statistics(conn_type, stat_type);
-       if(rv != CONNECTION_ERROR_NONE)
+       if (rv != CONNECTION_ERROR_NONE)
                return rv;
 
-
-       CONNECTION_LOG(CONNECTION_INFO,"connection_reset_statistics success\n");
+       CONNECTION_LOG(CONNECTION_INFO, "connection_reset_statistics success");
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1024,6 +1343,13 @@ EXPORT_API int connection_get_statistics(connection_h connection,
                                connection_type_e connection_type,
                                connection_statistics_type_e statistics_type, long long* size)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
+
+       if (connection_type == CONNECTION_TYPE_CELLULAR)
+               CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+       else if (connection_type == CONNECTION_TYPE_WIFI)
+               CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(__connection_check_handle_validity(connection)) || size == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1036,10 +1362,18 @@ EXPORT_API int connection_reset_statistics(connection_h connection,
                                connection_type_e connection_type,
                                connection_statistics_type_e statistics_type)
 {
-       if (!(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
+
+       if (connection_type == CONNECTION_TYPE_CELLULAR)
+               CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+       else if (connection_type == CONNECTION_TYPE_WIFI)
+               CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
+       if (!__connection_check_handle_validity(connection)) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        return __reset_statistic(connection_type, statistics_type);
 }
+