X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-audio.c;h=bed8e2c56445458b21ab37fb280a85b0e0cced26;hb=89402339a81775d534510fb74c539f10655ef6c2;hp=eb1523dd0548f28df7b4d8ed6e56a20314e9bb3b;hpb=4fb3c2ae989c0df21db2c03c37ec103658d3f97e;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-api/bt-audio.c b/bt-api/bt-audio.c
index eb1523d..bed8e2c 100644
--- a/bt-api/bt-audio.c
+++ b/bt-api/bt-audio.c
@@ -24,9 +24,7 @@
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_audio_init(bt_audio_func_ptr cb, void *user_data)
 {
@@ -88,7 +86,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 		return BLUETOOTH_ERROR_PERMISSION_DEINED;
 	}
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
 		BT_ERR("Blacklist device");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -118,7 +115,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 			return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
 		}
 	}
-#endif
 
 	user_info = _bt_get_user_data(BT_AUDIO);
 	retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -128,7 +124,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 
 	g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t));
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (service_function == BT_AV_CONNECT)
 		result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_CONNECT,
 				in_param1, in_param2, in_param3, in_param4,
@@ -138,7 +133,7 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 				in_param1, in_param2, in_param3, in_param4,
 				user_info->cb, user_info->user_data);
 	else /* default case - with or without DPM enabled */
-#endif
+
 		result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AUDIO_CONNECT,
 				in_param1, in_param2, in_param3, in_param4,
 				user_info->cb, user_info->user_data);
@@ -193,7 +188,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
 		return BLUETOOTH_ERROR_PERMISSION_DEINED;
 	}
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
 		BT_ERR("Blacklist device");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -216,7 +210,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
 			return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
 		}
 	}
-#endif
 
 	user_info = _bt_get_user_data(BT_AUDIO);
 	retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -282,7 +275,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
 		return BLUETOOTH_ERROR_PERMISSION_DEINED;
 	}
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
 		BT_ERR("Blacklist device");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -305,7 +297,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
 			return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
 		}
 	}
-#endif
 
 	user_info = _bt_get_user_data(BT_AUDIO);
 	retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -339,7 +330,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
 		return BLUETOOTH_ERROR_PERMISSION_DEINED;
 	}
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
 		BT_ERR("Blacklist device");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -349,7 +339,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
 		BT_ERR("Not allow to use A2DP profile");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
 	}
-#endif
 
 	user_info = _bt_get_user_data(BT_AUDIO);
 	retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -549,12 +538,10 @@ BT_EXPORT_API int bluetooth_ag_set_speaker_gain(unsigned int speaker_gain)
 
 	BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
 	if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) {
 		BT_ERR("Not allow to use HSP profile");
 		return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
 	}
-#endif
 
 	BT_INIT_PARAMS();
 	BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);