From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Wed, 13 Jul 2016 10:44:37 +0000 (+0900)
Subject: Modify the supported check logic from build time to run time
X-Git-Tag: submit/tizen/20160809.064342~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6486ba43c3df1e1278716dda3a5df98648aafd3d;p=platform%2Fcore%2Fapi%2Fbluetooth.git

Modify the supported check logic from build time to run time

Change-Id: Id06d6cc21bc219ff47813e43eee368651575824a
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f792ad..43f49de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,9 @@ ELSE ()
 ENDIF (TIZEN_TV)
 
 IF (TIZEN_TV)
-	SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api db-util")
+	SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api db-util capi-system-info")
 ELSE ()
-	SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api")
+	SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api capi-system-info")
 ENDIF (TIZEN_TV)
 SET(pc_dependents "capi-base-common glib-2.0")
 
diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index 689d051..d83cd30 100644
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -20,6 +20,7 @@
 
 #include <dlog.h>
 #include <stdbool.h>
+#include <system_info.h>
 #include <bluetooth-api.h>
 #include <bluetooth-audio-api.h>
 #include <bluetooth-telephony-api.h>
@@ -43,6 +44,7 @@ extern "C" {
 
 #define OPP_UUID "00001105-0000-1000-8000-00805f9b34fb"
 
+
 /**
  * @internal
  * @brief Bluetooth callback.
@@ -347,15 +349,30 @@ typedef void (*_bt_gatt_client_value_changed_cb)(char *char_path,
 		return BT_ERROR_INVALID_PARAMETER; \
 	}
 
-#ifdef TIZEN_BT_DISABLE
-#define BT_CHECK_BT_SUPPORT() \
-	{ \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_BT_SUPPORT()
-#endif
+#define BT_FEATURE_COMMON "tizen.org/feature/network.bluetooth"
+#define BT_FEATURE_LE "tizen.org/feature/network.bluetooth.le"
+#define BT_FEATURE_AUDIO_CALL "tizen.org/feature/network.bluetooth.audio.call"
+#define BT_FEATURE_AUDIO_MEDIA "tizen.org/feature/network.bluetooth.audio.media"
+#define BT_FEATURE_AUDIO_CONTROLLER "tizen.org/feature/network.bluetooth.audio.controller"
+#define BT_FEATURE_HEALTH "tizen.org/feature/network.bluetooth.health"
+#define BT_FEATURE_HID_HOST "tizen.org/feature/network.bluetooth.hid"
+#define BT_FEATURE_HID_DEVICE "tizen.org/feature/network.bluetooth.hid_device"
+#define BT_FEATURE_OPP "tizen.org/feature/network.bluetooth.opp"
+#define BT_FEATURE_TETHERING "tizen.org/feature/network.tethering.bluetooth"
+#define BT_FEATURE_PBAP_CLIENT "tizen.org/feature/network.bluetooth.phonebook.client"
+
+#define BT_CHECK_SUPPORTED_FEATURE(feature_name) \
+do	{ \
+	bool is_supported = false; \
+	if (!system_info_get_platform_bool(feature_name, &is_supported)) { \
+		if (is_supported == false) { \
+			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
+			return BT_ERROR_NOT_SUPPORTED; \
+		} \
+	} else { \
+		LOGE("[%s] Fail to get the system feature: [%s]", __FUNCTION__, feature_name); \
+	} \
+} while (0)
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_MODULE
diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index d43e71b..06287a8 100644
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -21,6 +21,7 @@ BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(bluetooth-api)
 %endif
 BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  cmake
 
 %description
@@ -50,60 +51,22 @@ cp %{SOURCE1001} %{SOURCE1002} .
 
 %build
 
-%if "%{?_with_emulator}" == "1"
 %if "%{?profile}" == "wearable"
 export CFLAGS="$CFLAGS -DTIZEN_WEARABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_WEARABLE"
 export FFLAGS="$FFLAGS -DTIZEN_WEARABLE"
-%else
-export CFLAGS="$CFLAGS -DTIZEN_PBAP_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_PBAP_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_PBAP_DISABLE"
-%endif
-
-%else # _with_emulator
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_ENGINEER_MODE -DTIZEN_AVRCP_CONTROL_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_ENGINEER_MODE -DTIZEN_AVRCP_CONTROL_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_ENGINEER_MODE -DTIZEN_AVRCP_CONTROL_DISABLE"
-
-%if "%{?profile}" == "tv"
-export CFLAGS="$CFLAGS -DTIZEN_OPP_CLIENT_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_OPP_CLIENT_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_OPP_CLIENT_DISABLE"
-
-export CFLAGS="$CFLAGS -DTIZEN_OPP_SERVER_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_OPP_SERVER_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_OPP_SERVER_DISABLE"
-
-export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE"
 %endif
 
-
 %if "%{?profile}" == "mobile"
-export CFLAGS="$CFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
-export CXXFLAGS="$CXXFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
-export FFLAGS="$FFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
+export CFLAGS="$CFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
+export CXXFLAGS="$CXXFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
+export FFLAGS="$FFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
 %endif
 
 export CFLAGS="$CFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
 export FFLAGS="$FFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
 
-%if "%{?profile}" == "wearable"
-export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
-export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
-%endif
-
-%if "%{?profile}" == "common"
-export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE"
-export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE"
-%endif
-%endif # _with_emulator
-
 %ifarch aarch64
 echo arch64
 export CFLAGS+=" -DARCH64"
diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index f4f0c15..4f09730 100644
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -28,17 +28,11 @@
 #include "bluetooth_internal.h"
 #include "bluetooth_private.h"
 
-#ifdef TIZEN_LE_DISABLE
 #define BT_CHECK_LE_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", \
-			__FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_LE_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_LE); \
+}
 
 static GSList *advertiser_list = NULL;
 
@@ -47,7 +41,7 @@ int bt_adapter_enable(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_enable_adapter());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -61,7 +55,7 @@ int bt_adapter_disable(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_disable_adapter());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -75,7 +69,7 @@ int bt_adapter_recover(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_recover_adapter());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -89,7 +83,7 @@ int bt_adapter_reset(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_reset_adapter());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -102,7 +96,7 @@ int bt_adapter_reset(void)
 
 int bt_adapter_get_state(bt_adapter_state_e *adapter_state)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(adapter_state);
 
@@ -115,7 +109,7 @@ int bt_adapter_le_enable(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_enable_adapter_le());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -129,7 +123,7 @@ int bt_adapter_le_disable(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_get_error_code(bluetooth_disable_adapter_le());
@@ -142,7 +136,7 @@ int bt_adapter_le_disable(void)
 
 int bt_adapter_le_get_state(bt_adapter_le_state_e *adapter_le_state)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(adapter_le_state);
 
@@ -156,7 +150,7 @@ int bt_adapter_get_address(char **address)
 	bluetooth_device_address_t loc_address = { {0} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 
@@ -183,7 +177,7 @@ int bt_adapter_get_version(char **version)
 	int ret = BT_ERROR_NONE;
 	bluetooth_version_t loc_ver = { { 0 } };
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(version);
 
@@ -212,7 +206,7 @@ int bt_adapter_get_version(char **version)
 int bt_adapter_get_local_info(char **chipset, char **firmware,
 			char **stack_version, char **profiles)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	int ret = BT_ERROR_NONE;
@@ -228,7 +222,7 @@ int bt_adapter_get_local_info(char **chipset, char **firmware,
 	char *local_stack_version = NULL;
 	char *local_profiles = NULL;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(chipset);
 	BT_CHECK_INPUT_PARAMETER(firmware);
@@ -432,7 +426,7 @@ int bt_adapter_get_name(char **name)
 	int ret = BT_ERROR_NONE;
 	bluetooth_device_name_t loc_name = { {0} };
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(name);
 
@@ -458,7 +452,7 @@ int bt_adapter_set_name(const char *name)
 	bluetooth_device_name_t loc_name = { {0} };
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(name);
 
@@ -480,7 +474,7 @@ int bt_adapter_get_visibility(bt_adapter_visibility_mode_e *mode, int *duration)
 	bluetooth_discoverable_mode_t discoverable_mode = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(mode);
 
@@ -515,7 +509,7 @@ int bt_adapter_set_visibility(bt_adapter_visibility_mode_e visibility_mode,
 	bluetooth_discoverable_mode_t discoverable_mode = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE;
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	switch (visibility_mode) {
 	case BT_ADAPTER_VISIBILITY_MODE_LIMITED_DISCOVERABLE:
@@ -549,7 +543,7 @@ int bt_adapter_set_connectable_changed_cb(bt_adapter_connectable_changed_cb call
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_CONNECTABLE_CHANGED_EVENT, callback, user_data);
@@ -563,7 +557,7 @@ int bt_adapter_set_connectable_changed_cb(bt_adapter_connectable_changed_cb call
 
 int bt_adapter_unset_connectable_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_CONNECTABLE_CHANGED_EVENT);
 	return BT_ERROR_NONE;
@@ -574,7 +568,7 @@ int bt_adapter_get_connectable(bool *connectable)
 	gboolean is_connectable = FALSE;
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(connectable);
 
@@ -593,7 +587,7 @@ int bt_adapter_set_connectable(bool connectable)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_get_error_code(bluetooth_set_connectable(connectable));
@@ -615,7 +609,7 @@ int bt_adapter_foreach_bonded_device(bt_adapter_bonded_device_cb foreach_cb,
 	int ret = BT_ERROR_NONE;
 	int i = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(foreach_cb);
 
@@ -671,7 +665,7 @@ int bt_adapter_get_bonded_device_info(const char *remote_address,
 	bluetooth_device_address_t addr_hex = { {0,} };
 	bluetooth_device_info_t *info;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address); /* LCOV_EXCL_START */
 
@@ -702,7 +696,7 @@ int bt_adapter_get_bonded_device_info(const char *remote_address,
 
 int bt_adapter_free_device_info(bt_device_info_s *device_info)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_info);
 
@@ -716,7 +710,7 @@ int bt_adapter_is_service_used(const char *service_uuid, bool *used)
 	int ret = BT_ERROR_NONE;
 	gboolean is_used = FALSE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(service_uuid);
 	BT_CHECK_INPUT_PARAMETER(used);
@@ -745,7 +739,7 @@ int bt_adapter_set_state_changed_cb(bt_adapter_state_changed_cb callback,
 	BT_DBG("");
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_STATE_CHANGED, callback, user_data);
@@ -761,7 +755,7 @@ int bt_adapter_set_state_changed_cb(bt_adapter_state_changed_cb callback,
 int bt_adapter_le_set_state_changed_cb(bt_adapter_le_state_changed_cb callback,
 							void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 
@@ -776,7 +770,7 @@ int bt_adapter_set_name_changed_cb(bt_adapter_name_changed_cb callback,
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_NAME_CHANGED, callback, user_data);
@@ -793,7 +787,7 @@ int bt_adapter_set_visibility_mode_changed_cb(bt_adapter_visibility_mode_changed
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_VISIBILITY_MODE_CHANGED, callback, user_data);
@@ -810,7 +804,7 @@ int bt_adapter_set_device_discovery_state_changed_cb(bt_adapter_device_discovery
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_DEVICE_DISCOVERY_STATE_CHANGED,
@@ -840,7 +834,7 @@ int bt_adapter_le_set_device_discovery_state_changed_cb(bt_adapter_le_device_dis
 
 int bt_adapter_unset_state_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_STATE_CHANGED);
 	return BT_ERROR_NONE;
@@ -859,7 +853,7 @@ int bt_adapter_le_unset_state_changed_cb(void)
 
 int bt_adapter_unset_name_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_NAME_CHANGED);
 	return BT_ERROR_NONE;
@@ -867,7 +861,7 @@ int bt_adapter_unset_name_changed_cb(void)
 
 int bt_adapter_unset_visibility_mode_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_VISIBILITY_MODE_CHANGED);
 	return BT_ERROR_NONE;
@@ -878,7 +872,7 @@ int bt_adapter_set_visibility_duration_changed_cb(bt_adapter_visibility_duration
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_VISIBILITY_DURATION_CHANGED, callback, user_data);
@@ -892,7 +886,7 @@ int bt_adapter_set_visibility_duration_changed_cb(bt_adapter_visibility_duration
 
 int bt_adapter_unset_visibility_duration_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_VISIBILITY_DURATION_CHANGED);
 	return BT_ERROR_NONE;
@@ -900,7 +894,7 @@ int bt_adapter_unset_visibility_duration_changed_cb(void)
 
 int bt_adapter_unset_device_discovery_state_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_DEVICE_DISCOVERY_STATE_CHANGED);
 	return BT_ERROR_NONE;
@@ -921,7 +915,7 @@ int bt_adapter_start_device_discovery(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_start_discovery(0, 0,
 					BLUETOOTH_DEVICE_MAJOR_MASK_MISC));
@@ -936,7 +930,7 @@ int bt_adapter_stop_device_discovery(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_cancel_discovery());
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -950,7 +944,7 @@ int bt_adapter_is_discovering(bool *is_discovering)
 {
 	int ret = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(is_discovering);
 
@@ -1022,7 +1016,7 @@ int bt_adapter_get_local_oob_data(unsigned char **hash,
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(hash);
 	BT_CHECK_INPUT_PARAMETER(randomizer);
@@ -1053,7 +1047,7 @@ int bt_adapter_set_remote_oob_data(const char *remote_address,
 	bluetooth_device_address_t addr_hex = { {0,} };
 	bt_oob_data_t oob_data = { {0},};
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address); /* LCOV_EXCL_START */
 
@@ -1080,7 +1074,7 @@ int bt_adapter_remove_remote_oob_data(const char *remote_address)
 	int ret = BT_ERROR_NONE;
 	bluetooth_device_address_t addr_hex = { {0,} };
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 
@@ -1103,7 +1097,7 @@ int bt_adapter_set_manufacturer_data(char *data, int len)
 	int ret;
 	bluetooth_manufacturer_data_t m_data = { 0 };
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(data);
 
@@ -1131,7 +1125,7 @@ int bt_adapter_set_manufacturer_data_changed_cb(
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_MANUFACTURER_DATA_CHANGED,
@@ -1146,7 +1140,7 @@ int bt_adapter_set_manufacturer_data_changed_cb(
 
 int bt_adapter_unset_manufacturer_data_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_MANUFACTURER_DATA_CHANGED);
 	return BT_ERROR_NONE;
@@ -1178,7 +1172,7 @@ int bt_adapter_le_remove_white_list(const char *address, bt_device_address_type_
 	int error_code = BT_ERROR_NONE;
 	bluetooth_device_address_t addr_hex = { {0,} };
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	_bt_convert_address_to_hex(&addr_hex, address);
@@ -3306,7 +3300,7 @@ int bt_adapter_le_read_maximum_data_length(
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	bluetooth_le_read_maximum_data_length_t max_le_datalength;
@@ -3334,7 +3328,7 @@ int bt_adapter_le_write_host_suggested_default_data_length(
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	/*Range for host suggested txtime is 0x001B-0x00FB  and
@@ -3362,7 +3356,7 @@ int bt_adapter_le_read_suggested_default_data_length(
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	bluetooth_le_read_host_suggested_data_length_t data_values;
diff --git a/src/bluetooth-audio.c b/src/bluetooth-audio.c
index f5b34c2..852d06c 100644
--- a/src/bluetooth-audio.c
+++ b/src/bluetooth-audio.c
@@ -36,43 +36,29 @@ static bool is_audio_hf_initialized = false;
 #endif
 static bool is_audio_ag_initialized = false;
 
-#if defined(TIZEN_HFP_DISABLE) && defined(TIZEN_A2DP_DISABLE)
 #define BT_CHECK_AUDIO_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_AUDIO_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_CALL); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_MEDIA); \
+}
 
-#ifdef TIZEN_HFP_DISABLE
 #define BT_CHECK_HFP_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_HFP_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_CALL); \
+}
 
-#ifdef TIZEN_A2DP_DISABLE
 #define BT_CHECK_A2DP_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_A2DP_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_MEDIA); \
+}
 
 #ifdef TIZEN_AUDIO_HF_DISABLE
 #define BT_CHECK_HF_SUPPORT() \
 		{ \
-			BT_CHECK_BT_SUPPORT(); \
+			BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
 			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
 			return BT_ERROR_NOT_SUPPORTED; \
 		}
diff --git a/src/bluetooth-avrcp.c b/src/bluetooth-avrcp.c
index 0f29df3..8d659f8 100644
--- a/src/bluetooth-avrcp.c
+++ b/src/bluetooth-avrcp.c
@@ -25,27 +25,17 @@
 static bool is_avrcp_target_initialized = false;
 static bool is_avrcp_control_initialized = false;
 
-#ifdef TIZEN_AVRCP_DISABLE
 #define BT_CHECK_AVRCP_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_AVRCP_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_MEDIA); \
+}
 
-#ifdef TIZEN_AVRCP_CONTROL_DISABLE
 #define BT_CHECK_AVRCP_CONTROL_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_AVRCP_CONTROL_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_CONTROLLER); \
+}
 
 #define BT_CHECK_AVRCP_TARGET_INIT_STATUS() \
 	if (__bt_check_avrcp_target_init_status() == BT_ERROR_NOT_INITIALIZED) { \
diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 77453b8..e40f8bd 100644
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -63,7 +63,7 @@ static int __bt_gatt_client_update_descriptors(bt_gatt_handle_info_t desc_handle
 
 int bt_initialize(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	if (is_initialized != true) {
 		if (bluetooth_register_callback(&__bt_event_proxy, NULL) != BLUETOOTH_ERROR_NONE) {
 			BT_ERR("OPERATION_FAILED(0x%08x)", BT_ERROR_OPERATION_FAILED); /* LCOV_EXCL_LINE */
@@ -77,7 +77,7 @@ int bt_initialize(void)
 
 int bt_deinitialize(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	if (bluetooth_unregister_callback() != BLUETOOTH_ERROR_NONE) {
 		BT_ERR("OPERATION_FAILED(0x%08x)", BT_ERROR_OPERATION_FAILED); /* LCOV_EXCL_LINE */
diff --git a/src/bluetooth-device.c b/src/bluetooth-device.c
index 8335d52..35d4d9d 100644
--- a/src/bluetooth-device.c
+++ b/src/bluetooth-device.c
@@ -28,7 +28,7 @@ int bt_device_create_bond(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -46,7 +46,7 @@ int bt_device_create_bond_by_type(const char *device_address,
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -62,7 +62,7 @@ int bt_device_cancel_bonding(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_cancel_bonding()); /* LCOV_EXCL_LINE */
 	if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -77,7 +77,7 @@ int bt_device_destroy_bond(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address); /* LCOV_EXCL_LINE */
 
@@ -95,7 +95,7 @@ int bt_device_set_alias(const char *device_address, const char *alias)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 	BT_CHECK_INPUT_PARAMETER(alias); /* LCOV_EXCL_LINE */
@@ -114,7 +114,7 @@ int bt_device_set_authorization(const char *device_address, bt_device_authorizat
 	gboolean trusted = FALSE;
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -134,7 +134,7 @@ int bt_device_start_service_search(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int ret = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -155,7 +155,7 @@ int bt_device_cancel_service_search(void)
 {
 	int ret = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	ret = _bt_get_error_code(bluetooth_cancel_service_search());
 	if (ret != BT_ERROR_NONE)
@@ -175,7 +175,7 @@ int bt_device_foreach_connected_profiles(const char *remote_address, bt_device_c
 			BT_PROFILE_AG, BT_PROFILE_GATT, BT_PROFILE_NAP_SERVER,
 			0};
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 	BT_CHECK_INPUT_PARAMETER(callback); /* LCOV_EXCL_LINE */
@@ -209,7 +209,7 @@ int bt_device_is_profile_connected(const char *remote_address, bt_profile_e bt_p
 	int ret;
 	gboolean is_connected = FALSE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 
@@ -230,7 +230,7 @@ int bt_device_is_profile_connected(const char *remote_address, bt_profile_e bt_p
 
 int bt_device_set_bond_created_cb(bt_device_bond_created_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_BOND_CREATED, callback, user_data);
@@ -242,7 +242,7 @@ int bt_device_set_bond_created_cb(bt_device_bond_created_cb callback, void *user
 
 int bt_device_set_bond_destroyed_cb(bt_device_bond_destroyed_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_BOND_DESTROYED, callback, user_data);
@@ -254,7 +254,7 @@ int bt_device_set_bond_destroyed_cb(bt_device_bond_destroyed_cb callback, void *
 
 int bt_device_set_authorization_changed_cb(bt_device_authorization_changed_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_AUTHORIZATION_CHANGED, callback, user_data);
@@ -264,7 +264,7 @@ int bt_device_set_authorization_changed_cb(bt_device_authorization_changed_cb ca
 
 int bt_device_set_service_searched_cb(bt_device_service_searched_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_SERVICE_SEARCHED, callback, user_data);
@@ -279,7 +279,7 @@ int bt_device_get_connection_state(const char *remote_address,
 	bluetooth_device_address_t addr_hex = { {0,} };
 	bluetooth_connected_link_t connected_link = BLUETOOTH_CONNECTED_LINK_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 	BT_CHECK_INPUT_PARAMETER(connected);
@@ -319,7 +319,7 @@ int bt_device_get_connection_state(const char *remote_address,
 /* LCOV_EXCL_STOP */
 int bt_device_set_connection_state_changed_cb(bt_device_connection_state_changed_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_DEVICE_CONNECTION_STATUS, callback, user_data);
@@ -329,7 +329,7 @@ int bt_device_set_connection_state_changed_cb(bt_device_connection_state_changed
 
 int bt_device_unset_bond_created_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_BOND_CREATED);
 
@@ -340,7 +340,7 @@ int bt_device_unset_bond_created_cb(void)
 
 int bt_device_unset_bond_destroyed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_BOND_DESTROYED);
 
@@ -351,7 +351,7 @@ int bt_device_unset_bond_destroyed_cb(void)
 
 int bt_device_unset_authorization_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_AUTHORIZATION_CHANGED);
 	return BT_ERROR_NONE;
@@ -359,7 +359,7 @@ int bt_device_unset_authorization_changed_cb(void)
 
 int bt_device_unset_service_searched_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_SERVICE_SEARCHED);
 	return BT_ERROR_NONE;
@@ -367,7 +367,7 @@ int bt_device_unset_service_searched_cb(void)
 
 int bt_device_unset_connection_state_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_DEVICE_CONNECTION_STATUS);
 	return BT_ERROR_NONE;
@@ -380,7 +380,7 @@ int bt_device_le_conn_update(const char *device_address,
 	bluetooth_le_connection_param_t param = { 0 };
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 	BT_CHECK_INPUT_PARAMETER(parameters);
@@ -408,7 +408,7 @@ int bt_device_get_service_mask_from_uuid_list(char **uuids,
 	char **parts = NULL;
 	bt_service_class_t service_mask = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INPUT_PARAMETER(uuids);
 	BT_CHECK_INPUT_PARAMETER(service_mask_list);
 	BT_CHECK_INIT_STATUS();
@@ -610,7 +610,7 @@ int bt_device_le_set_data_length(const char *remote_address,
 {
 	int ret = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 
diff --git a/src/bluetooth-dpm.c b/src/bluetooth-dpm.c
index 9c4e6fc..d176b10 100644
--- a/src/bluetooth-dpm.c
+++ b/src/bluetooth-dpm.c
@@ -51,7 +51,7 @@ int bt_dpm_set_allow_bluetooth_mode(bt_dpm_allow_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_allow_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_mode(dpm_value));
@@ -66,7 +66,7 @@ int bt_dpm_get_allow_bluetooth_mode(bt_dpm_allow_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_allow_t dpm_value = BLUETOOTH_DPM_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_mode(&dpm_value));
 	if (error_code != BT_ERROR_NONE)
@@ -81,7 +81,7 @@ int bt_dpm_activate_device_restriction(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_device_restriction(dpm_value));
@@ -96,7 +96,7 @@ int bt_dpm_is_device_restriction_active(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_device_restriction_active(&dpm_value));
@@ -112,7 +112,7 @@ int bt_dpm_activate_uuid_restriction(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_uuid_restriction(dpm_value));
@@ -127,7 +127,7 @@ int bt_dpm_is_uuid_restriction_active(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_uuid_restriction_active(&dpm_value));
@@ -143,7 +143,7 @@ int bt_dpm_add_devices_to_blacklist(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -160,7 +160,7 @@ int bt_dpm_add_devices_to_whitelist(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -176,7 +176,7 @@ int bt_dpm_add_uuids_to_blacklist(const char *service_uuid)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_uuids_to_blacklist(service_uuid));
@@ -190,7 +190,7 @@ int bt_dpm_add_uuids_to_whitelist(const char *service_uuid)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_uuids_to_whitelist(service_uuid));
@@ -204,7 +204,7 @@ int bt_dpm_clear_devices_from_blacklist(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_devices_from_blacklist());
@@ -218,7 +218,7 @@ int bt_dpm_clear_devices_from_whitelist(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_devices_from_whitelist());
@@ -232,7 +232,7 @@ int bt_dpm_clear_uuids_from_blacklist(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_uuids_from_blacklist());
@@ -246,7 +246,7 @@ int bt_dpm_clear_uuids_from_whitelist(void)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_uuids_from_whitelist());
@@ -286,7 +286,7 @@ int bt_dpm_get_devices_from_blacklist(bt_dpm_device_list_s **device_list)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_device_list_t dev_list;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_devices_from_blacklist(&dev_list));
@@ -303,7 +303,7 @@ int bt_dpm_get_devices_from_whitelist(bt_dpm_device_list_s **device_list)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_device_list_t dev_list;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_devices_from_whitelist(&dev_list));
@@ -349,7 +349,7 @@ int bt_dpm_get_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_uuids_list_t uuids;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_uuids_from_blacklist(&uuids));
@@ -366,7 +366,7 @@ int bt_dpm_get_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_uuids_list_t uuids;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_uuids_from_whitelist(&uuids));
@@ -383,7 +383,7 @@ int bt_dpm_remove_device_from_whitelist(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -400,7 +400,7 @@ int bt_dpm_remove_device_from_blacklist(const char *device_address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(device_address);
 
@@ -416,7 +416,7 @@ int bt_dpm_remove_uuid_from_whitelist(const char *service_uuid)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_uuid_from_whitelist(service_uuid));
@@ -430,7 +430,7 @@ int bt_dpm_remove_uuid_from_blacklist(const char *service_uuid)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_uuid_from_blacklist(service_uuid));
@@ -445,7 +445,7 @@ int bt_dpm_set_allow_outgoing_call(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_outgoing_call(dpm_value));
@@ -460,7 +460,7 @@ int bt_dpm_get_allow_outgoing_call(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_outgoing_call(&dpm_value));
@@ -476,7 +476,7 @@ int bt_dpm_set_pairing_state(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_pairing_state(dpm_value));
@@ -491,7 +491,7 @@ int bt_dpm_get_pairing_state(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_pairing_state(&dpm_value));
@@ -508,7 +508,7 @@ int bt_dpm_set_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e value)
 	bt_dpm_status_t dpm_value = value;
 	bt_dpm_profile_t dpm_profile = profile;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_profile_state(dpm_profile, dpm_value));
@@ -523,7 +523,7 @@ int bt_dpm_get_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_profile_state(profile, &dpm_value));
@@ -539,7 +539,7 @@ int bt_dpm_set_desktop_connectivity_state(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_desktop_connectivity_state(dpm_value));
@@ -554,7 +554,7 @@ int bt_dpm_get_desktop_connectivity_state(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_desktop_connectivity_state(&dpm_value));
@@ -570,7 +570,7 @@ int bt_dpm_set_discoverable_state(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_discoverable_state(dpm_value));
@@ -585,7 +585,7 @@ int bt_dpm_get_discoverable_state(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_discoverable_state(&dpm_value));
@@ -601,7 +601,7 @@ int bt_dpm_set_limited_discoverable_state(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_limited_discoverable_state(dpm_value));
@@ -616,7 +616,7 @@ int bt_dpm_get_limited_discoverable_state(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_limited_discoverable_state(&dpm_value));
@@ -632,7 +632,7 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = value;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_data_transfer_state(dpm_value));
@@ -647,7 +647,7 @@ int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value)
 	int error_code = BT_ERROR_NONE;
 	bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_data_transfer_state(&dpm_value));
diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index 64d9911..cd3e30d 100644
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -32,17 +32,11 @@ static GSList *gatt_server_list = NULL;
 static bool is_gatt_server_initialized = false;
 static bool is_gatt_server_started = false;
 
-#ifdef TIZEN_GATT_DISABLE
 #define BT_CHECK_GATT_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, \
-						BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_GATT_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_LE); \
+}
 
 #define BT_CHECK_GATT_SERVER_INIT_STATUS() { \
 	if (__bt_check_gatt_server_init_status() == BT_ERROR_NOT_INITIALIZED) { \
diff --git a/src/bluetooth-hdp.c b/src/bluetooth-hdp.c
index a2885de..efc9c38 100644
--- a/src/bluetooth-hdp.c
+++ b/src/bluetooth-hdp.c
@@ -24,16 +24,11 @@
 #include "bluetooth.h"
 #include "bluetooth_private.h"
 
-#ifdef TIZEN_HDP_DISABLE
 #define BT_CHECK_HDP_SUPPORT() \
-	{ \
-		BT_CHECK_BT_SUPPORT(); \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_HDP_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_HEALTH); \
+}
 
 int bt_hdp_register_sink_app(unsigned short data_type, char **app_id)
 {
diff --git a/src/bluetooth-hid.c b/src/bluetooth-hid.c
index 15eb31f..fd38b0a 100644
--- a/src/bluetooth-hid.c
+++ b/src/bluetooth-hid.c
@@ -28,27 +28,17 @@
 
 static bool is_hid_host_initialized = false;
 
-#ifdef TIZEN_HID_HOST_DISABLE
 #define BT_CHECK_HID_HOST_SUPPORT() \
-	{ \
-		BT_CHECK_BT_SUPPORT(); \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_HID_HOST_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_HID_HOST); \
+}
 
-#ifdef TIZEN_HID_DEVICE_DISABLE
 #define BT_CHECK_HID_DEVICE_SUPPORT() \
-	{ \
-		BT_CHECK_BT_SUPPORT(); \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_HID_DEVICE_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_HID_DEVICE); \
+}
 
 #define BT_CHECK_HID_HOST_INIT_STATUS() \
 	if (__bt_check_hid_host_init_status() == BT_ERROR_NOT_INITIALIZED) { \
diff --git a/src/bluetooth-opp-client.c b/src/bluetooth-opp-client.c
index 6fd8b26..cf24c64 100644
--- a/src/bluetooth-opp-client.c
+++ b/src/bluetooth-opp-client.c
@@ -27,16 +27,11 @@
 GList *sending_files;
 static bool is_opp_client_initialized = false;
 
-#ifdef TIZEN_OPP_CLIENT_DISABLE
 #define BT_CHECK_OPP_CLIENT_SUPPORT() \
-	{ \
-		BT_CHECK_BT_SUPPORT(); \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_OPP_CLIENT_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_OPP); \
+}
 
 #define BT_CHECK_OPP_CLIENT_INIT_STATUS() \
 	if (__bt_check_opp_client_init_status() == BT_ERROR_NOT_INITIALIZED) { \
diff --git a/src/bluetooth-opp-server.c b/src/bluetooth-opp-server.c
index c7c2fea..29bb652 100644
--- a/src/bluetooth-opp-server.c
+++ b/src/bluetooth-opp-server.c
@@ -24,17 +24,11 @@
 
 static bool is_opp_server_initialized = false;
 
-#ifdef TIZEN_OPP_SERVER_DISABLE
 #define BT_CHECK_OPP_SERVER_SUPPORT() \
-	{ \
-		BT_CHECK_BT_SUPPORT(); \
-		LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, \
-					BT_ERROR_NOT_SUPPORTED); \
-		return BT_ERROR_NOT_SUPPORTED; \
-	}
-#else
-#define BT_CHECK_OPP_SERVER_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_OPP); \
+}
 
 
 #define BT_CHECK_OPP_SERVER_INIT_STATUS() \
diff --git a/src/bluetooth-pan.c b/src/bluetooth-pan.c
index bf8714e..17ac6e5 100644
--- a/src/bluetooth-pan.c
+++ b/src/bluetooth-pan.c
@@ -24,16 +24,12 @@
 #include "bluetooth.h"
 #include "bluetooth_private.h"
 
-#ifdef TIZEN_PAN_DISABLE
 #define BT_CHECK_PAN_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_PAN_SUPPORT()
-#endif
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_TETHERING); \
+}
+
 /* LCOV_EXCL_START */
 int bt_nap_activate(void)
 {
diff --git a/src/bluetooth-pbap.c b/src/bluetooth-pbap.c
index deda90c..6e81256 100644
--- a/src/bluetooth-pbap.c
+++ b/src/bluetooth-pbap.c
@@ -25,20 +25,15 @@
 #include "bluetooth_internal.h"
 #include "bluetooth_private.h"
 
-#ifdef TIZEN_PBAP_DISABLE
-#define BT_CHECK_PBAP_SUPPORT() \
-		{ \
-			BT_CHECK_BT_SUPPORT(); \
-			LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \
-			return BT_ERROR_NOT_SUPPORTED; \
-		}
-#else
-#define BT_CHECK_PBAP_SUPPORT()
-#endif
+#define BT_CHECK_PBAP_CLIENT_SUPPORT() \
+{ \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_PBAP_CLIENT); \
+}
 
 int bt_pbap_client_initialize(void)
 {
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	int error_code = BT_ERROR_NONE;
 	error_code = _bt_get_error_code(bluetooth_pbap_init());
@@ -50,7 +45,7 @@ int bt_pbap_client_initialize(void)
 
 int bt_pbap_client_deinitialize(void)
 {
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	int error_code = BT_ERROR_NONE;
 	error_code = _bt_get_error_code(bluetooth_pbap_deinit());
@@ -62,7 +57,7 @@ int bt_pbap_client_deinitialize(void)
 
 int bt_pbap_client_set_connection_state_changed_cb(bt_pbap_connection_state_changed_cb callback, void *user_data)
 {
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_PBAP_CONNECTION_STATUS, callback, user_data);
@@ -71,7 +66,7 @@ int bt_pbap_client_set_connection_state_changed_cb(bt_pbap_connection_state_chan
 }
 int bt_pbap_client_unset_connection_state_changed_cb(void)
 {
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	if (_bt_check_cb(BT_EVENT_PBAP_CONNECTION_STATUS) == true)
 		_bt_unset_cb(BT_EVENT_PBAP_CONNECTION_STATUS);
@@ -83,7 +78,7 @@ int bt_pbap_client_connect(const char *address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 
@@ -101,7 +96,7 @@ int bt_pbap_client_disconnect(const char *address)
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 
@@ -121,7 +116,7 @@ int bt_pbap_client_get_phone_book_size(const char *address, bt_pbap_address_book
 	bt_pbap_folder_t folder = { 0, };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	BT_CHECK_INPUT_PARAMETER(callback);
@@ -150,7 +145,7 @@ int bt_pbap_client_get_phone_book(const char *address, bt_pbap_address_book_sour
 	bt_pbap_folder_t folder = { 0, };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	BT_CHECK_INPUT_PARAMETER(callback);
@@ -194,7 +189,7 @@ int bt_pbap_client_get_list(const char *address, bt_pbap_address_book_source_e s
 	bt_pbap_folder_t folder = { 0, };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	BT_CHECK_INPUT_PARAMETER(callback);
@@ -228,7 +223,7 @@ int bt_pbap_client_pull_vcard(const char *address, bt_pbap_address_book_source_e
 
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	BT_CHECK_INPUT_PARAMETER(callback);
@@ -263,7 +258,7 @@ int bt_pbap_client_search_phone_book(const char *address,
 	bt_pbap_search_parameters_t app_param = { 0, };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_PBAP_SUPPORT();
+	BT_CHECK_PBAP_CLIENT_SUPPORT();
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(address);
 	BT_CHECK_INPUT_PARAMETER(callback);
diff --git a/src/bluetooth-socket.c b/src/bluetooth-socket.c
index 34a1dff..bd5d86d 100644
--- a/src/bluetooth-socket.c
+++ b/src/bluetooth-socket.c
@@ -27,7 +27,7 @@ int bt_socket_create_rfcomm(const char *uuid, int *socket_fd)
 {
 	int ret = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(uuid);
 	BT_CHECK_INPUT_PARAMETER(socket_fd);
@@ -47,7 +47,7 @@ int bt_socket_destroy_rfcomm(int socket_fd)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_rfcomm_remove_socket(socket_fd));
 	if (error_code != BT_ERROR_NONE) {
@@ -60,7 +60,7 @@ int bt_socket_destroy_rfcomm(int socket_fd)
 /* LCOV_EXCL_START */
 int bt_socket_is_service_used(const char *service_uuid, bool *used)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(service_uuid);
 	BT_CHECK_INPUT_PARAMETER(used);
@@ -74,7 +74,7 @@ int bt_socket_listen_and_accept_rfcomm(int socket_fd, int max_pending_connection
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	error_code = _bt_get_error_code(bluetooth_rfcomm_listen_and_accept(socket_fd, max_pending_connections));
 	if (error_code != BT_ERROR_NONE) {
@@ -89,7 +89,7 @@ int bt_socket_listen(int socket_fd, int max_pending_connections)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_get_error_code(bluetooth_rfcomm_listen(socket_fd, max_pending_connections));
@@ -105,7 +105,7 @@ int bt_socket_accept(int socket_fd)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_get_error_code(bluetooth_rfcomm_accept_connection(socket_fd));
@@ -121,7 +121,7 @@ int bt_socket_reject(int socket_fd)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 
 	error_code = _bt_get_error_code(bluetooth_rfcomm_reject_connection(socket_fd));
@@ -137,7 +137,7 @@ int bt_socket_create_rfcomm_ex(const char *uuid, const char *bus_name, const cha
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(uuid);
 	BT_CHECK_INPUT_PARAMETER(bus_name);
@@ -156,7 +156,7 @@ int bt_socket_destroy_rfcomm_ex(const char *uuid)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(uuid);
 
@@ -173,7 +173,7 @@ int bt_socket_listen_and_accept_rfcomm_ex(const char *uuid, int max_pending_conn
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(uuid);
 	BT_CHECK_INPUT_PARAMETER(bus_name);
@@ -193,7 +193,7 @@ int bt_socket_connect_rfcomm(const char *remote_address, const char *remote_port
 	bluetooth_device_address_t addr_hex = { {0,} };
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS(); /* LCOV_EXCL_START */
 	BT_CHECK_INPUT_PARAMETER(remote_address);
 	BT_CHECK_INPUT_PARAMETER(remote_port_uuid);
@@ -213,7 +213,7 @@ int bt_socket_disconnect_rfcomm(int socket_fd)
 {
 	int error_code = BT_ERROR_NONE;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS(); /* LCOV_EXCL_START */
 
 	error_code = _bt_get_error_code(bluetooth_rfcomm_disconnect(socket_fd));
@@ -229,7 +229,7 @@ int bt_socket_send_data(int socket_fd, const char *data, int length)
 {
 	int ret = 0;
 
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS(); /* LCOV_EXCL_START */
 	BT_CHECK_INPUT_PARAMETER(data);
 
@@ -256,7 +256,7 @@ int bt_socket_send_data(int socket_fd, const char *data, int length)
 
 int bt_socket_set_data_received_cb(bt_socket_data_received_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_DATA_RECEIVED, callback, user_data);
@@ -265,7 +265,7 @@ int bt_socket_set_data_received_cb(bt_socket_data_received_cb callback, void *us
 
 int bt_socket_unset_data_received_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_DATA_RECEIVED);
 	return BT_ERROR_NONE;
@@ -273,7 +273,7 @@ int bt_socket_unset_data_received_cb(void)
 
 int bt_socket_set_connection_requested_cb(bt_socket_connection_requested_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_RFCOMM_CONNECTION_REQUESTED, callback, user_data);
@@ -282,7 +282,7 @@ int bt_socket_set_connection_requested_cb(bt_socket_connection_requested_cb call
 
 int bt_socket_unset_connection_requested_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_RFCOMM_CONNECTION_REQUESTED);
 	return BT_ERROR_NONE;
@@ -290,7 +290,7 @@ int bt_socket_unset_connection_requested_cb(void)
 
 int bt_socket_set_connection_state_changed_cb(bt_socket_connection_state_changed_cb callback, void *user_data)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	BT_CHECK_INPUT_PARAMETER(callback);
 	_bt_set_cb(BT_EVENT_CONNECTION_STATE_CHANGED, callback, user_data);
@@ -299,7 +299,7 @@ int bt_socket_set_connection_state_changed_cb(bt_socket_connection_state_changed
 
 int bt_socket_unset_connection_state_changed_cb(void)
 {
-	BT_CHECK_BT_SUPPORT();
+	BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
 	BT_CHECK_INIT_STATUS();
 	_bt_unset_cb(BT_EVENT_CONNECTION_STATE_CHANGED);
 	return BT_ERROR_NONE;