From: Wootak Jung <wootak.jung@samsung.com>
Date: Tue, 11 Sep 2018 08:28:32 +0000 (+0900)
Subject: Fix return-type mismatch issue
X-Git-Tag: accepted/tizen/unified/20180913.064014~8
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git;a=commitdiff_plain;h=ce8c09bf3086d996be3898794c949fac1aaa4865

Fix return-type mismatch issue

Change-Id: I07ed4db7b8f6395ba9b532ceaa744d9148de8e47
---

diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c
index 8a1051f..7729084 100644
--- a/bt-api/bt-adapter.c
+++ b/bt-api/bt-adapter.c
@@ -89,7 +89,7 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
 				BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED);
 
 #ifdef TIZEN_FEATURE_BT_DPM
-	retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_DPM_RESULT_ACCESS_DENIED,
+	retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
 				BLUETOOTH_ERROR_PERMISSION_DEINED);
 #endif
 
diff --git a/bt-api/bt-dpm.c b/bt-api/bt-dpm.c
index 3c78062..8dd213b 100644
--- a/bt-api/bt-dpm.c
+++ b/bt-api/bt-dpm.c
@@ -248,14 +248,12 @@ static bt_dpm_status_e _bt_check_dpm_spp_restriction(void)
 int _bt_check_dpm(int service, void *param)
 {
 	bt_dpm_status_e status = BT_DPM_ALLOWED;
-	int ret = BLUETOOTH_ERROR_NONE;
 	BT_CHECK_ENABLED_ANY(return);
 
 	switch (service) {
 	case BT_DPM_HF_ONLY:
 		status = _bt_check_dpm_handsfree_only();
 		break;
-
 	case BT_DPM_PAIRING:
 		status = _bt_check_dpm_pairing_restriction();
 		break;
@@ -288,21 +286,12 @@ int _bt_check_dpm(int service, void *param)
 	case BT_DPM_SPP:
 		status = _bt_check_dpm_spp_restriction();
 		break;
-
 	default:
 		BT_ERR("Unknown service");
 		return status;
 	}
 
-	if (status == BT_DPM_RESTRICTED) {
-		BT_INFO("Service [%d], DPM permission denied", service);
-		ret = BLUETOOTH_ERROR_PERMISSION_DEINED;
-	} else if (status == BT_DPM_NO_SERVICE) {
-		BT_DBG("DPM no service [%d]", status);
-		ret = BLUETOOTH_ERROR_SERVICE_NOT_FOUND;
-	}
-
-	return ret;
+	return status;
 }
 
 BT_EXPORT_API int bluetooth_dpm_set_allow_mode(bt_dpm_allow_t value)
@@ -371,7 +360,10 @@ BT_EXPORT_API int bluetooth_dpm_get_allow_mode(bt_dpm_allow_t *value)
 	int result;
 
 #ifdef TIZEN_FEATURE_BT_DPM
-	*value = bluetooth_dpm_is_mode_allowed();
+	if (vconf_get_int(VCONFKEY_BT_DPM_STATUS, value) != 0) {
+		BT_ERR("fail to get vconf key!");
+		return BLUETOOTH_ERROR_INTERNAL;
+	}
 	result = BLUETOOTH_ERROR_NONE;
 #else
 	BT_CHECK_ENABLED_ANY(return);