Modified the Odroid is always allow to ACL status. 45/108045/2 accepted/tizen/3.0/common/20170103.073532 accepted/tizen/3.0/mobile/20170103.011435 accepted/tizen/3.0/tv/20170103.011459 accepted/tizen/3.0/wearable/20170103.011514 submit/tizen_3.0/20170102.124107
authorSegwon <segwon.han@samsung.com>
Mon, 2 Jan 2017 12:28:10 +0000 (21:28 +0900)
committerSegwon <segwon.han@samsung.com>
Mon, 2 Jan 2017 12:37:51 +0000 (21:37 +0900)
Signed-off-by: Segwon <segwon.han@samsung.com>
Change-Id: If64a61dcca5ddbddf0766db948de3806895482f6

daemon/service_provider/RemoteAppControlServiceProvider.cpp

index 0375bc38e43972e501314a4692a6ea7de19d12eb..58f0e2ce3d9f941bf7ee1a108e49e47bf546f662 100755 (executable)
@@ -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 {