1. Add core d2d.admin, d2d.appcontrol, d2d.datasharing privilege for mobile/wearable...

Change-Id: I20f730a2f128409c1f80f576aa897f389e45caa6
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 c39b92c..c6ac5c1 100644 (file)
--- a/capi/res/dbspace/core_privilege_info.csv
+++ b/capi/res/dbspace/core_privilege_info.csv
@@ -36,6 +36,9 @@ mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/contact.write,IDS_TPLA
 wearable,core,public,2.4,9.9,yes,http://tizen.org/privilege/contact.write,IDS_TPLATFORM_BODY_MANAGING_CONTACTS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_CREATE_UPDATE_AND_DELETE_YOUR_PROFILE_CONTACTS_AND_ANY_CONTACT_HISTORY_MSG,IDS_TPLATFORM_BODY_PERSONAL_INFORMATION_ABB,,
 mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/content.write,IDS_TPLATFORM_BODY_MANAGING_CONTENT,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_CHANGE_MEDIA_INFORMATION_THIS_INFORMATION_CAN_BE_USED_BY_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 wearable,core,public,2.3.1,9.9,yes,http://tizen.org/privilege/content.write,IDS_TPLATFORM_BODY_MANAGING_CONTENT,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_CHANGE_MEDIA_INFORMATION_THIS_INFORMATION_CAN_BE_USED_BY_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+common,core,platform,3,9.9,yes,http://tizen.org/privilege/d2d.admin,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+common,core,public,3,9.9,yes,http://tizen.org/privilege/d2d.appcontrol,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+common,core,public,3,9.9,yes,http://tizen.org/privilege/d2d.datasharing,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/datasharing,IDS_TPLATFORM_BODY_SHARING_DATA_BETWEEN_APPLICATIONS_M_NOUN,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_SHARE_DATA_WITH_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 wearable,core,public,2.3.1,9.9,yes,http://tizen.org/privilege/datasharing,IDS_TPLATFORM_BODY_SHARING_DATA_BETWEEN_APPLICATIONS_M_NOUN,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_SHARE_DATA_WITH_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 mobile,core,public,2.3,9.9,yes,http://tizen.org/privilege/display,IDS_TPLATFORM_BODY_MANAGING_DISPLAY_SETTINGS_M_NOUN,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_DISPLAY_SETTINGS_SUCH_AS_THE_BRIGHTNESS_THIS_MAY_INCREASE_BATTERY_CONSUMPTION,IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB,,

diff --git a/capi/res/dbspace/core_privilege_info.db b/capi/res/dbspace/core_privilege_info.db
index 047fc37..9db93b8 100644 (file)
Binary files a/capi/res/dbspace/core_privilege_info.db and b/capi/res/dbspace/core_privilege_info.db differ

diff --git a/capi/res/dbspace/core_privilege_mapping.csv b/capi/res/dbspace/core_privilege_mapping.csv
index 65a3715..d58035c 100644 (file)
--- a/capi/res/dbspace/core_privilege_mapping.csv
+++ b/capi/res/dbspace/core_privilege_mapping.csv
@@ -46,6 +46,9 @@ wearable,http://tizen.org/privilege/contact.write,2.4,9.9,http://tizen.org/privi
 wearable,http://tizen.org/privilege/contact.write,2.4,9.9,http://tizen.org/privilege/internal/buxton/contact.read
 mobile,http://tizen.org/privilege/content.write,2.3,9.9,http://tizen.org/privilege/content.write
 wearable,http://tizen.org/privilege/content.write,2.3.1,9.9,http://tizen.org/privilege/content.write
+common,http://tizen.org/privilege/d2d.admin,3,9.9,http://tizen.org/privilege/d2d.admin
+common,http://tizen.org/privilege/d2d.appcontrol,3,9.9,http://tizen.org/privilege/d2d.appcontrol
+common,http://tizen.org/privilege/d2d.datasharing,3,9.9,http://tizen.org/privilege/d2d.datasharing
 mobile,http://tizen.org/privilege/datasharing,2.3,9.9,http://tizen.org/privilege/datasharing
 wearable,http://tizen.org/privilege/datasharing,2.3.1,9.9,http://tizen.org/privilege/datasharing
 mobile,http://tizen.org/privilege/display,2.3,9.9,http://tizen.org/privilege/display

diff --git a/capi/res/dbspace/core_privilege_mapping.db b/capi/res/dbspace/core_privilege_mapping.db
index f05c6d2..da582ba 100644 (file)
Binary files a/capi/res/dbspace/core_privilege_mapping.db and b/capi/res/dbspace/core_privilege_mapping.db differ

diff --git a/capi/res/dbspace/tv_core_privilege_info.csv b/capi/res/dbspace/tv_core_privilege_info.csv
index 68bd3f9..39b7513 100644 (file)
--- a/capi/res/dbspace/tv_core_privilege_info.csv
+++ b/capi/res/dbspace/tv_core_privilege_info.csv
@@ -19,6 +19,9 @@ tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/camera,IDS_TPLATFORM_BODY_
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/contact.read,IDS_TPLATFORM_BODY_READING_CONTACTS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_READ_YOUR_PROFILE_CONTACTS_AND_CONTACT_HISTORY_CONTACT_HISTORY_CAN_INCLUDE_SOCIAL_NETWORK_ACTIVITY,IDS_TPLATFORM_BODY_PERSONAL_INFORMATION_ABB,,
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/contact.write,IDS_TPLATFORM_BODY_MANAGING_CONTACTS,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_CREATE_UPDATE_AND_DELETE_YOUR_PROFILE_CONTACTS_AND_ANY_CONTACT_HISTORY_MSG,IDS_TPLATFORM_BODY_PERSONAL_INFORMATION_ABB,,
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/content.write,IDS_TPLATFORM_BODY_MANAGING_CONTENT,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_CHANGE_MEDIA_INFORMATION_THIS_INFORMATION_CAN_BE_USED_BY_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+tv,core,platform,3,9.9,yes,http://tizen.org/privilege/d2d.admin,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+tv,core,public,3,9.9,yes,http://tizen.org/privilege/d2d.appcontrol,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
+tv,core,public,3,9.9,yes,http://tizen.org/privilege/d2d.datasharing,,,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/datasharing,IDS_TPLATFORM_BODY_SHARING_DATA_BETWEEN_APPLICATIONS_M_NOUN,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_SHARE_DATA_WITH_OTHER_APPLICATIONS,IDS_TPLATFORM_BODY_SYSTEM_SETTINGS_ABB,,
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/display,IDS_TPLATFORM_BODY_MANAGING_DISPLAY_SETTINGS_M_NOUN,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_DISPLAY_SETTINGS_SUCH_AS_THE_BRIGHTNESS_THIS_MAY_INCREASE_BATTERY_CONSUMPTION,IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB,,
 tv,core,public,2.4,9.9,yes,http://tizen.org/privilege/download,IDS_TPLATFORM_BODY_DOWNLOADING_VIA_HTTP,IDS_TPLATFORM_BODY_THIS_APPLICATION_CAN_MANAGE_HTTP_DOWNLOADS_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES_DEPENDING_ON_YOUR_PAYMENT_PLAN,IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB,,

diff --git a/capi/res/dbspace/tv_core_privilege_info.db b/capi/res/dbspace/tv_core_privilege_info.db
index d529ef3..2fd71e2 100644 (file)
Binary files a/capi/res/dbspace/tv_core_privilege_info.db and b/capi/res/dbspace/tv_core_privilege_info.db differ

diff --git a/capi/res/dbspace/tv_core_privilege_mapping.csv b/capi/res/dbspace/tv_core_privilege_mapping.csv
index 01fd88d..c02655e 100644 (file)
--- a/capi/res/dbspace/tv_core_privilege_mapping.csv
+++ b/capi/res/dbspace/tv_core_privilege_mapping.csv
@@ -25,6 +25,9 @@ tv,http://tizen.org/privilege/contact.read,2.4,9.9,http://tizen.org/privilege/in
 tv,http://tizen.org/privilege/contact.write,2.4,9.9,http://tizen.org/privilege/contact.write
 tv,http://tizen.org/privilege/contact.write,2.4,9.9,http://tizen.org/privilege/internal/buxton/contact.read
 tv,http://tizen.org/privilege/content.write,2.4,9.9,http://tizen.org/privilege/content.write
+tv,http://tizen.org/privilege/d2d.admin,3,9.9,http://tizen.org/privilege/d2d.admin
+tv,http://tizen.org/privilege/d2d.appcontrol,3,9.9,http://tizen.org/privilege/d2d.appcontrol
+tv,http://tizen.org/privilege/d2d.datasharing,3,9.9,http://tizen.org/privilege/d2d.datasharing
 tv,http://tizen.org/privilege/datasharing,2.4,9.9,http://tizen.org/privilege/datasharing
 tv,http://tizen.org/privilege/display,2.4,9.9,http://tizen.org/privilege/display
 tv,http://tizen.org/privilege/download,2.4,9.9,http://tizen.org/privilege/download

diff --git a/capi/res/dbspace/tv_core_privilege_mapping.db b/capi/res/dbspace/tv_core_privilege_mapping.db
index ed46721..2203974 100644 (file)
Binary files a/capi/res/dbspace/tv_core_privilege_mapping.db and b/capi/res/dbspace/tv_core_privilege_mapping.db differ

diff --git a/capi/res/dbspace/wrt_privilege_mapping.csv b/capi/res/dbspace/wrt_privilege_mapping.csv
index 86e6ef5..966f277 100644 (file)
--- a/capi/res/dbspace/wrt_privilege_mapping.csv
+++ b/capi/res/dbspace/wrt_privilege_mapping.csv
@@ -122,7 +122,7 @@ common,http://tizen.org/privilege/internal/default/public,2.2.1,9.9,http://tizen
 common,http://tizen.org/privilege/internal/default/public,2.2.1,2.2.1,http://tizen.org/privilege/call,
 common,http://tizen.org/privilege/internal/default/public,2.2.1,2.2.1,http://tizen.org/privilege/internet,
 common,http://tizen.org/privilege/internal/default/public,2.2.1,2.2.1,http://tizen.org/privilege/recorder,
-wearable,http://tizen.org/privilege/internal/default/public,2.2.1,2.2.1,http://tizen.org/privilege/camera,
+common,http://tizen.org/privilege/internal/default/public,2.2.1,2.2.1,http://tizen.org/privilege/camera,
 common,http://tizen.org/privilege/internal/default/public,2.2.1,9.9,http://tizen.org/privilege/appmanager.launch,
 common,http://tizen.org/privilege/internal/default/public,2.2.1,9.9,http://tizen.org/privilege/haptic,
 common,http://tizen.org/privilege/internal/default/public,2.2.1,9.9,http://tizen.org/privilege/internal/buxton/network.get,
@@ -136,7 +136,7 @@ common,http://tizen.org/privilege/internal/default/partner,2.2.1,9.9,http://tize
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,2.2.1,http://tizen.org/privilege/call,
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,2.2.1,http://tizen.org/privilege/internet,
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,2.2.1,http://tizen.org/privilege/recorder,
-wearable,http://tizen.org/privilege/internal/default/partner,2.2.1,2.2.1,http://tizen.org/privilege/camera,
+common,http://tizen.org/privilege/internal/default/partner,2.2.1,2.2.1,http://tizen.org/privilege/camera,
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,9.9,http://tizen.org/privilege/appmanager.launch,
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,9.9,http://tizen.org/privilege/haptic,
 common,http://tizen.org/privilege/internal/default/partner,2.2.1,9.9,http://tizen.org/privilege/internal/buxton/network.get,
@@ -151,7 +151,7 @@ common,http://tizen.org/privilege/internal/default/platform,2.2.1,9.9,http://tiz
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,2.2.1,http://tizen.org/privilege/call,
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,2.2.1,http://tizen.org/privilege/internet,
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,2.2.1,http://tizen.org/privilege/recorder,
-wearable,http://tizen.org/privilege/internal/default/platform,2.2.1,2.2.1,http://tizen.org/privilege/camera,
+common,http://tizen.org/privilege/internal/default/platform,2.2.1,2.2.1,http://tizen.org/privilege/camera,
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,9.9,http://tizen.org/privilege/appmanager.launch,
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,9.9,http://tizen.org/privilege/haptic,
 common,http://tizen.org/privilege/internal/default/platform,2.2.1,9.9,http://tizen.org/privilege/internal/buxton/network.get,

diff --git a/capi/res/dbspace/wrt_privilege_mapping.db b/capi/res/dbspace/wrt_privilege_mapping.db
index 9e8dcd9..bd85d64 100644 (file)
Binary files a/capi/res/dbspace/wrt_privilege_mapping.db and b/capi/res/dbspace/wrt_privilege_mapping.db differ

diff --git a/test/tc-privilege-manager.c b/test/tc-privilege-manager.c
index 9eb6a13..a1be684 100755 (executable)
--- a/test/tc-privilege-manager.c
+++ b/test/tc-privilege-manager.c
@@ -320,6 +320,26 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        g_list_free(privilege_list);
        privilege_list = NULL;
 
+    /* 3.0 core - mobile */
+    __print_dline();
+    __change_to_bold_yellow();
+    __tcinfo(api_version, "2.3");
+    __tcinfo(pkg_type, "core");
+    __change_color_to_origin();
+    __print_dline();
+
+       __tcinfo(goal, "normal mapping");
+    __privinfo("http://tizen.org/privilege/message.read", NULL, NULL);
+    __tcinfo(expect, "PRVMGR_ERR_NONE");
+    ret = privilege_manager_get_mapped_privilege_list("3.0", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
+    __print_result(__get_result_string(ret));
+    __check_verify_result(PRVMGR_ERR_NONE, ret);
+    __print_privilege_list(mapped_privilege_list);
+    __print_line();
+
+    g_list_free(privilege_list);
+    privilege_list = NULL;
+
        /* 2.2.1 wrt - mobile */
        __print_dline();
        __change_to_bold_yellow();