[Alarm] Moved checking privileges to JS layer.

[Verification] Code compiles without errors.

Change-Id: Ie4b430b96a1d19a62e1267bbb0ec82c74fbbcf9d
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/alarm/alarm_api.js b/src/alarm/alarm_api.js
index 156808faedb6767e376b10847182bd417f203cd3..38bd0824a6b1e954d0582a5200d977d7eb1931b3 100644 (file)
--- a/src/alarm/alarm_api.js
+++ b/src/alarm/alarm_api.js
@@ -5,6 +5,7 @@
 var T = xwalk.utils.type;
 var Converter = xwalk.utils.converter;
 var AV = xwalk.utils.validator;
+var Privilege = xwalk.utils.privilege;
 
 var native = new xwalk.utils.NativeManager(extension);
 
@@ -41,6 +42,8 @@ function UpdateInternalData_(internal, data) {
 
 //class AlarmManager ////////////////////////////////////////////////////
 AlarmManager.prototype.add = function () {
+    xwalk.utils.checkPrivilegeAccess(Privilege.ALARM);
+
     var args = AV.validateMethod(arguments, [
         {
             name : 'alarm',
@@ -87,6 +90,8 @@ AlarmManager.prototype.add = function () {
 };
 
 AlarmManager.prototype.remove = function () {
+    xwalk.utils.checkPrivilegeAccess(Privilege.ALARM);
+
     var args = AV.validateMethod(arguments, [
         {
             name : 'id',
@@ -102,6 +107,8 @@ AlarmManager.prototype.remove = function () {
 };
 
 AlarmManager.prototype.removeAll = function () {
+    xwalk.utils.checkPrivilegeAccess(Privilege.ALARM);
+
     var result = native.callSync('AlarmManager_removeAll', {});
 
     if (native.isFailure(result)) {

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index cf65e0a616e40b5849f14c2dacf31e3818c223dc..d3c02cd2b199a597c2d2fc5beb51c9b23a7206d2 100644 (file)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -22,7 +22,6 @@ 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 kAlarmRelative = "AlarmRelative";
 const std::string kAlarmAbsolute = "AlarmAbsolute";
@@ -57,7 +56,6 @@ AlarmManager::~AlarmManager() {
 
 void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   if (!args.contains("alarm")) {
     LoggerE("Invalid parameter passed.");
@@ -211,7 +209,6 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
 
 void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   int id = 0;
 
@@ -239,7 +236,6 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
 
 void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   if (ALARM_ERROR_NONE != alarm_cancel_all()) {
     LoggerE("Platform unknown error.");