[Alarm] Added privilege checks.

Change-Id: I28031cfd813991c03e7fcf2966e2aef16091096a

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index e32ae5096bb28fd400120d76282e4fefd2ecad90..a92ed8c99e72a41bbb6476faf9bcf89d7e1a44ad 100644 (file)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -62,7 +62,7 @@ AlarmManager& AlarmManager::GetInstance() {
 
 void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  util::CheckAccess(kPrivilegeAlarm);
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   if (!args.contains("alarm")) {
     LoggerE("Invalid parameter passed.");
@@ -216,7 +216,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
 
 void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  util::CheckAccess(kPrivilegeAlarm);
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   int id = 0;
 
@@ -244,7 +244,7 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) {
 
 void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) {
   LoggerD("Entered");
-  util::CheckAccess(kPrivilegeAlarm);
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out);
 
   if (ALARM_ERROR_NONE != alarm_cancel_all()) {
     LoggerE("Platform unknown error.");

diff --git a/src/alarm/alarm_utils.cc b/src/alarm/alarm_utils.cc
index 608351cf940b789a826eb9c52158cae5cfa86aac..c4c2a22b0b2edd02bf48a9bbd02b8824f9657e6c 100644 (file)
--- a/src/alarm/alarm_utils.cc
+++ b/src/alarm/alarm_utils.cc
@@ -12,10 +12,6 @@ namespace util {
 
 using namespace common;
 
-void CheckAccess(const std::string& privilege) {
-  // TODO: check access to privilege, throw exception on failure
-}
-
 PlatformResult AppControlToService(const picojson::object& obj, app_control_h *app_control) {
   LoggerD("Entered");
 

diff --git a/src/alarm/alarm_utils.h b/src/alarm/alarm_utils.h
index 62948f83570e4c2b279ba3b286fbcc99f1c19ba3..f5f0b5ed69e6ca9b93c17252a48a5fd0e6c75e9c 100644 (file)
--- a/src/alarm/alarm_utils.h
+++ b/src/alarm/alarm_utils.h
@@ -14,8 +14,6 @@ namespace extension {
 namespace alarm {
 namespace util {
 
-void CheckAccess(const std::string& privilege);
-
 common::PlatformResult AppControlToService(const picojson::object& obj, app_control_h *app_control);
 common::PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj,
                                                     app_control_h *app_control);