[Privilege] adapt privilege to Cynara

Change-Id: If75d8e54c6d9de7156bf0e062dad98d9883f9830
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index c63a501d359535954da81b95d058188c29e5df11..3f5799d7db056e5e1e61d462b613f89296fb4600 100755 (executable)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -37,7 +37,7 @@ namespace alarm {
 
 namespace {
 const int kDateSize = 22; //"yyy mm dd hh mm ss dd" e.g 115 11 28 11 25 50 -1
-const std::string kPrivilegeAlarm = "http://tizen.org/privilege/alarm";
+const std::string kPrivilegeAlarm = "http://tizen.org/privilege/alarm.get";
 
 const std::string kAlarmRelative = "AlarmRelative";
 const std::string kAlarmAbsolute = "AlarmAbsolute";

diff --git a/src/application/application_instance.cc b/src/application/application_instance.cc
index 67ff539d538debac1ecd87ff9f61ae14db343669..3364901d54868b15ef9d514153f7037215d59038 100755 (executable)
--- a/src/application/application_instance.cc
+++ b/src/application/application_instance.cc
@@ -28,10 +28,10 @@ namespace application {
 
 namespace {
 // The privileges that are required in Application API
-const std::string kPrivilegeAppManagerCertificate = "http://tizen.org/privilege/appmanager.certificate";
+const std::string kPrivilegeAppManagerCertificate = "http://tizen.org/privilege/notexist";
 const std::string kPrivilegeAppManagerKill = "http://tizen.org/privilege/appmanager.kill";
-const std::string kPrivilegeApplicationInfo = "http://tizen.org/privilege/application.info";
-const std::string kPrivilegeApplicationLaunch = "http://tizen.org/privilege/application.launch";
+const std::string kPrivilegeApplicationInfo = "http://tizen.org/privilege/packagemanager.info";
+const std::string kPrivilegeApplicationLaunch = "http://tizen.org/privilege/appmanager.launch";
 }  // namespace
 
 using namespace common;

diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc
index 9fb3f01cbd95bc4469e34346150f74de1895aee5..c9e621d37985854e295c501d7f3a1a3189481a2d 100755 (executable)
--- a/src/archive/archive_instance.cc
+++ b/src/archive/archive_instance.cc
@@ -37,8 +37,8 @@ namespace archive {
 using namespace common;
 
 namespace {
-const std::string kPrivilegeFilesystemRead  = "http://tizen.org/privilege/filesystem.read";
-const std::string kPrivilegeFilesystemWrite  = "http://tizen.org/privilege/filesystem.write";
+const std::string kPrivilegeFilesystemRead  = "http://tizen.org/privilege/systemsettings.admin";
+const std::string kPrivilegeFilesystemWrite  = "http://tizen.org/privilege/systemsettings.admin";
 
 const std::string kArchiveFileEntryOptDest = "destination";
 const std::string kArchiveFileEntryOptStrip = "stripSourceDirectory";

diff --git a/src/bookmark/bookmark_instance.cc b/src/bookmark/bookmark_instance.cc
index 7f8e4bd883616d9e42ca9b9340d9978319a66dfb..14bd0340d218b3dd283957e19d9a5ad9d5c866de 100755 (executable)
--- a/src/bookmark/bookmark_instance.cc
+++ b/src/bookmark/bookmark_instance.cc
@@ -37,8 +37,8 @@ namespace {
   const char kParentId[] = "parentId";
   const char kUrl[] = "url";
 
-  const std::string kPrivilegeBookmarkRead = "http://tizen.org/privilege/bookmark.read";
-  const std::string kPrivilegeBookmarkWrite = "http://tizen.org/privilege/bookmark.write";
+  const std::string kPrivilegeBookmarkRead = "http://tizen.org/privilege/bookmark.admin";
+  const std::string kPrivilegeBookmarkWrite = "http://tizen.org/privilege/bookmark.admin";
 }  // namespace
 
 BookmarkInstance::BookmarkInstance() {

diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc
index ef7889dc8c6e498f3f96bd3d2ad9bd0eda4b42d6..dc9e6c85ed8f11a5b4db9c2b32740cc67979c470 100755 (executable)
--- a/src/datacontrol/datacontrol_instance.cc
+++ b/src/datacontrol/datacontrol_instance.cc
@@ -37,7 +37,7 @@ namespace datacontrol {
 
 namespace {
 // The privileges that required in Datacontrol API
-const std::string kPrivilegeDatacontrol = "http://tizen.org/privilege/datacontrol.consumer";
+const std::string kPrivilegeDatacontrol = "http://tizen.org/privilege/datasharing";
 
 }  // namespace
 

diff --git a/src/networkbearerselection/networkbearerselection_instance.cc b/src/networkbearerselection/networkbearerselection_instance.cc
index 809c83610b8f80ef7addacfe800b2ce1e632b52c..6e3921460f34ac3b913f65568e48688cd6f54764 100644 (file)
--- a/src/networkbearerselection/networkbearerselection_instance.cc
+++ b/src/networkbearerselection/networkbearerselection_instance.cc
@@ -29,7 +29,7 @@ namespace networkbearerselection {
 
 namespace {
 // The privileges that required in NetworkBearerSelection API
-const std::string kPrivilegeNetworkBearerSelection = "http://tizen.org/privilege/networkbearerselection";
+const std::string kPrivilegeNetworkBearerSelection = "http://tizen.org/privilege/network.set";
 const std::string kPrivilegeInternet = "http://tizen.org/privilege/internet";
 const std::vector<std::string> kNbsPrivileges{kPrivilegeNetworkBearerSelection, kPrivilegeInternet};
 

diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index 781f90e80f1317d1f2b0c06fee4b625450b523a5..f29a2984634ed3db16fb0101a7746a360be60be9 100644 (file)
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -40,9 +40,9 @@ namespace {
 
 const std::string kPrivilegeNfcAdmin = "http://tizen.org/privilege/nfc.admin";
 const std::string kPrivilegeNfcCardEmulation = "http://tizen.org/privilege/nfc.cardemulation";
-const std::string kPrivilegeNfcCommon = "http://tizen.org/privilege/nfc.common";
-const std::string kPrivilegeNfcP2P = "http://tizen.org/privilege/nfc.p2p";
-const std::string kPrivilegeNfcTag = "http://tizen.org/privilege/nfc.tag";
+const std::string kPrivilegeNfcCommon = "http://tizen.org/privilege/nfc";
+const std::string kPrivilegeNfcP2P = "http://tizen.org/privilege/nfc";
+const std::string kPrivilegeNfcTag = "http://tizen.org/privilege/nfc";
 
 } // namespace
 

diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc
index 2f19734209e5117ee1c942c80ae6316219645ce8..26924297083b4d6bfb999fea383aa72cad884e6a 100644 (file)
--- a/src/package/package_instance.cc
+++ b/src/package/package_instance.cc
@@ -40,8 +40,8 @@ using common::PlatformResult;
 
 namespace {
 // The privileges that required in Package API
-const std::string kPrivilegePackageInstall = "http://tizen.org/privilege/packagemanager.install";
-const std::string kPrivilegePackageInfo = "http://tizen.org/privilege/package.info";
+const std::string kPrivilegePackageInstall = "http://tizen.org/privilege/packagemanager.admin";
+const std::string kPrivilegePackageInfo = "http://tizen.org/privilege/packagemanager.info";
 }  // namespace
 
 typedef enum _PackageThreadWorkType {

diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc
index a4b566ded4bf6cd3cbb4b2a74629ce6ebabb6ade..6d7d2df7ce3a90922a16e2eeab300123db0cd927 100755 (executable)
--- a/src/power/power_instance.cc
+++ b/src/power/power_instance.cc
@@ -34,7 +34,7 @@ namespace power {
 
 namespace {
 // The privileges that required in Power API
-const std::string kPrivilegePower = "http://tizen.org/privilege/power";
+const std::string kPrivilegePower = "http://tizen.org/privilege/display";
 
 const std::map<std::string, PowerResource> kPowerResourceMap = {
     {"SCREEN", POWER_RESOURCE_SCREEN},

diff --git a/src/systemsetting/systemsetting_instance.cc b/src/systemsetting/systemsetting_instance.cc
index 7877e8484a817a9e72e2fc7a172af2febcee2cf4..c9e702a3e9ddc8c60b00034b3af56cfa482408de 100644 (file)
--- a/src/systemsetting/systemsetting_instance.cc
+++ b/src/systemsetting/systemsetting_instance.cc
@@ -36,7 +36,7 @@ const std::string SETTING_LOCK_SCREEN = "LOCK_SCREEN";
 const std::string SETTING_INCOMING_CALL = "INCOMING_CALL";
 const std::string SETTING_NOTIFICATION_EMAIL = "NOTIFICATION_EMAIL";
 
-const std::string kPrivilegeSetting = "http://tizen.org/privilege/setting";
+const std::string kPrivilegeSetting = "http://tizen.org/privilege/systemsettings.admin";
 }
 
 using namespace common;