From: Segwon <segwon.han@samsung.com>
Date: Mon, 2 Jan 2017 12:36:44 +0000 (+0900)
Subject: Modified the Odroid is always allow to ACL status.
X-Git-Tag: accepted/tizen/common/20170105.172850~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5622be6b40c51fcd7389a6f39c3b8a177c2b664;p=platform%2Fcore%2Fconvergence%2Fd2d-conv-manager.git

Modified the Odroid is always allow to ACL status.

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

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 0375bc3..58f0e2c 100755
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -310,10 +310,16 @@ static int __access_control(iotcon_request_h request, iotcon_attributes_h attrib
 	IF_FAIL_RETURN_TAG(ret == IOTCON_ERROR_NONE, CONV_ERROR_INVALID_PARAMETER, _E, "iotcon_representation_get_attributes() Fail(%d)", ret);
 
 	if (!strcmp(CONV_ACCESS_CONTROL_REQUEST, access_request_type)) {
+
 #if defined(_D2D_INTERNAL_ACL_)
 		ACManagerPolicy acManagerPolicy = ACMANAGER_POLICY_U;
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV)
+		_D("Internal ACL for Odroid.");
+		acManagerPolicy = ACMANAGER_POLICY_P;
+#else
+		_D("Internal ACL for Mobile & Wearable.");
 		IF_FAIL_RETURN_TAG(AddACLDevice(macAddress, deviceName, ip.c_str(), &acManagerPolicy) == ACLResult_OK, CONV_ERROR_INVALID_OPERATION, _E, "AddACLDevice failed");
-
+#endif
 		if (acManagerPolicy == ACMANAGER_POLICY_P) {
 			_D("PERMITTED");
 			policy = CONV_ACCESS_CONTROL_PERMITTED;
@@ -416,8 +422,13 @@ static int __app_control_launch(iotcon_request_h request, iotcon_attributes_h at
 
 #if defined(_D2D_INTERNAL_ACL_)
 	ACManagerPolicy acManagerPolicy = ACMANAGER_POLICY_U;
-
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV)
+	_D("Internal ACL for Odroid.");
+	acManagerPolicy = ACMANAGER_POLICY_P;
+#else
+	_D("Internal ACL for Mobile & Wearable.");
 	IF_FAIL_RETURN_TAG(GetACLState(macAddress, &acManagerPolicy) == ACLResult_OK, CONV_ERROR_INVALID_OPERATION, _E, "ACL check failed");
+#endif
 	if (acManagerPolicy == ACMANAGER_POLICY_P) {
 		_D("PERMITTED");
 	} else {