change se_type VCONFKEY (sync with Tizen 2.4 vconfkey)

Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
Change-Id: I339183bb19444163da4ad6f8757a550113b7d0fb

diff --git a/client/net_nfc_client_se.c b/client/net_nfc_client_se.c
index cb132c6..a4f80eb 100644 (file)
--- a/client/net_nfc_client_se.c
+++ b/client/net_nfc_client_se.c
@@ -552,11 +552,11 @@ API net_nfc_error_e net_nfc_get_card_emulation_mode(net_nfc_se_type_e *type)
        {
                switch(se_type)
                {
-                       case VCONFKEY_NFC_SE_TYPE_UICC:
+                       case VCONFKEY_NFC_SE_POLICY_UICC_ON:
                                *type = NET_NFC_SE_TYPE_UICC;
                                break;
 
-                       case VCONFKEY_NFC_SE_TYPE_ESE:
+                       case VCONFKEY_NFC_SE_POLICY_ESE_ON:
                                *type = NET_NFC_SE_TYPE_ESE;
                                break;
 

diff --git a/daemon/net_nfc_server_se.c b/daemon/net_nfc_server_se.c
index 2c07efb..8992d97 100644 (file)
--- a/daemon/net_nfc_server_se.c
+++ b/daemon/net_nfc_server_se.c
@@ -216,7 +216,7 @@ static void _se_uicc_enable_card_emulation()
                net_nfc_server_se_set_se_type(SECURE_ELEMENT_TYPE_UICC);
                net_nfc_server_se_set_se_mode(SECURE_ELEMENT_VIRTUAL_MODE);
 
-               if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_UICC) < 0)
+               if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_UICC_ON) < 0)
                        NFC_ERR("vconf_set_int failed");
        }
        else
@@ -397,7 +397,7 @@ net_nfc_error_e net_nfc_server_se_change_se(uint8_t type)
                        net_nfc_server_se_set_se_type(SECURE_ELEMENT_TYPE_ESE);
                        net_nfc_server_se_set_se_mode(SECURE_ELEMENT_VIRTUAL_MODE);
 
-                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_ESE) != 0)
+                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_ESE_ON) != 0)
                                NFC_ERR("vconf_set_int failed");
                }
                else
@@ -412,7 +412,7 @@ net_nfc_error_e net_nfc_server_se_change_se(uint8_t type)
                {
                        NFC_INFO("card emulation turned off");
 
-                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_NONE) != 0)
+                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_NONE) != 0)
                                NFC_ERR("vconf_set_int failed");
                }
                break;

diff --git a/src/manager/net_nfc_service_se.c b/src/manager/net_nfc_service_se.c
index b5f06c4..a0ef16f 100755 (executable)
--- a/src/manager/net_nfc_service_se.c
+++ b/src/manager/net_nfc_service_se.c
@@ -132,7 +132,7 @@ net_nfc_error_e net_nfc_service_se_change_se(uint8_t type)
                        net_nfc_service_se_set_se_type(SECURE_ELEMENT_TYPE_UICC);
                        net_nfc_service_se_set_se_mode(SECURE_ELEMENT_VIRTUAL_MODE);
 
-                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_UICC) != 0)
+                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_UICC_ON) != 0)
                        {
                                DEBUG_ERR_MSG("vconf_set_int failed");
                        }
@@ -156,7 +156,7 @@ net_nfc_error_e net_nfc_service_se_change_se(uint8_t type)
                        net_nfc_service_se_set_se_type(SECURE_ELEMENT_TYPE_ESE);
                        net_nfc_service_se_set_se_mode(SECURE_ELEMENT_VIRTUAL_MODE);
 
-                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_ESE) != 0)
+                       if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_ESE_ON) != 0)
                        {
                                DEBUG_ERR_MSG("vconf_set_int failed");
                        }
@@ -182,7 +182,7 @@ net_nfc_error_e net_nfc_service_se_change_se(uint8_t type)
                        if (result_ese != NET_NFC_INVALID_HANDLE && result_uicc != NET_NFC_INVALID_HANDLE)
                        {
                                DEBUG_SERVER_MSG("SE off all");
-                               if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_TYPE_NONE) != 0)
+                               if (vconf_set_int(VCONFKEY_NFC_SE_TYPE, VCONFKEY_NFC_SE_POLICY_NONE) != 0)
                                {
                                        DEBUG_ERR_MSG("vconf_set_int failed");
                                }