Remove core privilege: vpnservice.admin

Change-Id: I2e02333bfb6886d702d09d18444737fb9830c878
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/capi/res/dbspace/core_privilege_info.csv b/capi/res/dbspace/core_privilege_info.csv
index f0015cf..a6305d3 100755 (executable)
--- a/capi/res/dbspace/core_privilege_info.csv
+++ b/capi/res/dbspace/core_privilege_info.csv
@@ -155,7 +155,6 @@ common,core,public,3,9.9,yes,http://tizen.org/privilege/use_ir,no,N/A,,IDS_ST_HE
 mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/volume.set,no,N/A,,IDS_TPLATFORM_HEADER_ADJUSTING_VOLUME,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ADJUST_THE_VOLUME_FOR_DIFFERENT_FEATURES_SUCH_AS_NOTIFICATION_ALERTS_RINGTONES_AND_MEDIA,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 wearable,core,public,2.3.1,9.9,yes,http://tizen.org/privilege/volume.set,no,N/A,,IDS_TPLATFORM_HEADER_ADJUSTING_VOLUME,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ADJUST_THE_VOLUME_FOR_DIFFERENT_FEATURES_SUCH_AS_NOTIFICATION_ALERTS_RINGTONES_AND_MEDIA,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 mobile,core,public,3,9.9,yes,http://tizen.org/privilege/vpnservice,no,N/A,,IDS_TPLATFORM_HEADER_MANAGING_VPN_HVIRTUAL_PRIVATE_NETWORK,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_THE_VPN_HVIRTUAL_PRIVATE_NETWORK_AND_CHANGE_ITS_SETTINGS,IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB,,
-mobile,core,platform,3,9.9,yes,http://tizen.org/privilege/vpnservice.admin,no,N/A,,IDS_TPLATFORM_HEADER_ENABLING_DISABLING_VPN_HVIRTUAL_PRIVATE_NETWORK_FUNCTIONS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ENABLE_AND_DISABLE_THE_VPN_HVIRTUAL_PRIVATE_NETWORK_FUNCTIONS,IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB,,
 mobile,core,platform,2.3,9.9,yes,http://tizen.org/privilege/web-history.admin,yes,http://tizen.org/privacy/userhistory,,IDS_TPLATFORM_HEADER_MANAGING_INTERNET_HISTORY,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_YOUR_INTERNET_HISTORY,IDS_TPLATFORM_BODY_PERSONAL_INFORMATION_ABB,,
 common,core,public,2.3.1,9.9,yes,http://tizen.org/privilege/widget.viewer,no,N/A,,IDS_TPLATFORM_HEADER_SHOWING_WIDGETS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_SHOW_WIDGETS_AND_INFORMATION_FROM_THEIR_ASSOCIATED_APPLICATIONS_ON_THE_HOME_SCREEN,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/wifidirect,no,N/A,,IDS_TPLATFORM_HEADER_MANAGING_WI_FI_DIRECT_INFORMATION,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ENABLE_AND_DISABLE_WI_FI_DIRECT_MANAGE_WI_FI_DIRECT_CONNECTIONS_AND_CHANGE_WI_FI_DIRECT_SETTINGS,IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB,,

diff --git a/capi/res/dbspace/core_privilege_mapping.csv b/capi/res/dbspace/core_privilege_mapping.csv
index f7f7f0e..623440e 100644 (file)
--- a/capi/res/dbspace/core_privilege_mapping.csv
+++ b/capi/res/dbspace/core_privilege_mapping.csv
@@ -187,7 +187,6 @@ mobile,http://tizen.org/privilege/tethering.admin,2.3,9.9,http://tizen.org/privi
 common,http://tizen.org/privilege/use_ir,3,9.9,http://tizen.org/privilege/use_ir
 mobile,http://tizen.org/privilege/volume.set,2.3,9.9,http://tizen.org/privilege/volume.set
 mobile,http://tizen.org/privilege/vpnservice,3,9.9,http://tizen.org/privilege/vpnservice
-mobile,http://tizen.org/privilege/vpnservice.admin,3,9.9,http://tizen.org/privilege/vpnservice.admin
 wearable,http://tizen.org/privilege/volume.set,2.3.1,9.9,http://tizen.org/privilege/volume.set
 mobile,http://tizen.org/privilege/web-history.admin,2.3,9.9,http://tizen.org/privilege/web-history.admin
 common,http://tizen.org/privilege/widget.viewer,2.3.1,9.9,http://tizen.org/privilege/widget.viewer

diff --git a/capi/res/dbspace/tv_core_privilege_info.csv b/capi/res/dbspace/tv_core_privilege_info.csv
index b95fe80..22194e1 100644 (file)
--- a/capi/res/dbspace/tv_core_privilege_info.csv
+++ b/capi/res/dbspace/tv_core_privilege_info.csv
@@ -93,7 +93,6 @@ tv,core,platform,2.4,9.9,no,http://tizen.org/privilege/tethering.admin,no,N/A,,I
 tv,core,public,3,9.9,no,http://tizen.org/privilege/use_ir,no,N/A,,IDS_ST_HEADER_USING_INFRARED_TRANSMITTER,IDS_ST_BODY_THIS_APPLICATION_CAN_USE_THE_INFRARED_TRANSMITTER,IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB,,
 tv,core,public,2.4,9.9,no,http://tizen.org/privilege/volume.set,no,N/A,,IDS_TPLATFORM_HEADER_ADJUSTING_VOLUME,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ADJUST_THE_VOLUME_FOR_DIFFERENT_FEATURES_SUCH_AS_NOTIFICATION_ALERTS_RINGTONES_AND_MEDIA,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 tv,core,public,3,9.9,no,http://tizen.org/privilege/vpnservice,no,N/A,,IDS_TPLATFORM_HEADER_MANAGING_VPN_HVIRTUAL_PRIVATE_NETWORK,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_THE_VPN_HVIRTUAL_PRIVATE_NETWORK_AND_CHANGE_ITS_SETTINGS,IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB,,
-tv,core,platform,3,9.9,no,http://tizen.org/privilege/vpnservice.admin,no,N/A,,IDS_TPLATFORM_HEADER_ENABLING_DISABLING_VPN_HVIRTUAL_PRIVATE_NETWORK_FUNCTIONS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ENABLE_AND_DISABLE_THE_VPN_HVIRTUAL_PRIVATE_NETWORK_FUNCTIONS,IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB,,
 tv,core,platform,2.4,9.9,no,http://tizen.org/privilege/web-history.admin,yes,http://tizen.org/privacy/userhistory,,IDS_TPLATFORM_HEADER_MANAGING_INTERNET_HISTORY,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_YOUR_INTERNET_HISTORY,IDS_TPLATFORM_BODY_PERSONAL_INFORMATION_ABB,,
 tv,core,public,2.4,9.9,no,http://tizen.org/privilege/widget.viewer,no,N/A,,IDS_TPLATFORM_HEADER_SHOWING_WIDGETS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_SHOW_WIDGETS_AND_INFORMATION_FROM_THEIR_ASSOCIATED_APPLICATIONS_ON_THE_HOME_SCREEN,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 tv,core,public,2.4,9.9,no,http://tizen.org/privilege/wifidirect,no,N/A,,IDS_TPLATFORM_HEADER_MANAGING_WI_FI_DIRECT_INFORMATION,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_ENABLE_AND_DISABLE_WI_FI_DIRECT_MANAGE_WI_FI_DIRECT_CONNECTIONS_AND_CHANGE_WI_FI_DIRECT_SETTINGS,IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB,,

diff --git a/capi/res/dbspace/tv_core_privilege_mapping.csv b/capi/res/dbspace/tv_core_privilege_mapping.csv
index 01c8d81..fc5431e 100644 (file)
--- a/capi/res/dbspace/tv_core_privilege_mapping.csv
+++ b/capi/res/dbspace/tv_core_privilege_mapping.csv
@@ -111,7 +111,6 @@ tv,http://tizen.org/privilege/tethering.admin,2.4,9.9,http://tizen.org/privilege
 tv,http://tizen.org/privilege/use_ir,3,9.9,http://tizen.org/privilege/use_ir
 tv,http://tizen.org/privilege/volume.set,2.4,9.9,http://tizen.org/privilege/volume.set
 tv,http://tizen.org/privilege/vpnservice,3,9.9,http://tizen.org/privilege/vpnservice
-tv,http://tizen.org/privilege/vpnservice.admin,3,9.9,http://tizen.org/privilege/vpnservice.admin
 tv,http://tizen.org/privilege/web-history.admin,2.4,9.9,http://tizen.org/privilege/web-history.admin
 tv,http://tizen.org/privilege/widget.viewer,2.4,9.9,http://tizen.org/privilege/widget.viewer
 tv,http://tizen.org/privilege/wifidirect,2.4,9.9,http://tizen.org/privilege/wifidirect

diff --git a/test/tc-privilege-manager.c b/test/tc-privilege-manager.c
index 791ee3f..ba12a69 100755 (executable)
--- a/test/tc-privilege-manager.c
+++ b/test/tc-privilege-manager.c
@@ -527,7 +527,6 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/reboot", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/keygrab", "Platform", NULL);
-       __privinfo("http://tizen.org/privilege/vpnservice.admin", "Platform", "Valid from 3.0, Mobile profile only");
        __tcinfo(cert_level, "platform");
        __tcinfo(expect, PRVMGR_ERR_NONE);
        __privilege_manager_verify_privilege();
@@ -548,7 +547,6 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/reboot", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/keygrab", "Platform", NULL);
-       __privinfo("http://tizen.org/privilege/vpnservice.admin", "Platform", "Mobile profile only");
        __tcinfo(cert_level, "public");
        __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
        __privilege_manager_verify_privilege();