From: segwon <segwon.han@samsung.com>
Date: Mon, 21 Nov 2016 02:59:07 +0000 (+0900)
Subject: Remove the wearable define about ACL.
X-Git-Tag: accepted/tizen/common/20161121.143334~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F98824%2F1;p=platform%2Fcore%2Fconvergence%2Fd2d-conv-manager.git

Remove the wearable define about ACL.
(Wearable ACL state is unconditional permit)

Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: Ied5748e4212511745146f84fab4a5a4dc5a531f9
---

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 37fdf26..c5d7490 100755
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -239,9 +239,7 @@ static int __access_control(iotcon_request_h request, iotcon_attributes_h attrib
 	if (!strcmp(CONV_ACCESS_CONTROL_REQUEST, access_request_type)) {
 		ACManagerPolicy acManagerPolicy = ACMANAGER_POLICY_U;
 		IF_FAIL_RETURN_TAG(AddACLDevice(macAddress, deviceName, ip.c_str(), &acManagerPolicy) == ACLResult_OK, CONV_ERROR_INVALID_OPERATION, _E, "AddACLDevice failed");
-#if defined(_WEARABLE_)
-		acManagerPolicy = ACMANAGER_POLICY_P;
-#endif
+
 		if (acManagerPolicy == ACMANAGER_POLICY_P) {
 			_D("PERMITTED");
 			policy = CONV_ACCESS_CONTROL_PERMITTED;
@@ -318,7 +316,6 @@ static int __app_control_launch(iotcon_request_h request, iotcon_attributes_h at
 	_D("Device IP : %s, Mac : %s", ip.c_str(), macAddress);
 	ACManagerPolicy acManagerPolicy = ACMANAGER_POLICY_U;
 
-#if !defined(_WEARABLE_)
 	IF_FAIL_RETURN_TAG(GetACLState(macAddress, &acManagerPolicy) == ACLResult_OK, CONV_ERROR_INVALID_OPERATION, _E, "ACL check failed");
 	if (acManagerPolicy == ACMANAGER_POLICY_P) {
 		_D("PERMITTED");
@@ -326,7 +323,6 @@ static int __app_control_launch(iotcon_request_h request, iotcon_attributes_h at
 		_D("Device is not permitted %d", acManagerPolicy);
 		return CONV_ERROR_INVALID_OPERATION;
 	}
-#endif
 
 	app_control_h app_control;
 	int reply = 0;