Revert "[power] - checking privileges moved to JS layer"

This reverts commit a5b3b23a7fcee681a24e974c1b1a10a7b876d9b5.

[Verification] Code compiles.5 TCTs fail because: "CurrentBrightness, CustomBrightness is not declare at org.tizen.system.deviced.display."

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

diff --git a/src/power/power_api.js b/src/power/power_api.js
index bb049c16fe1b01997ed85094f8eed5651c670987..d74fba31100aa8e9827bd192be1e97b2de219676 100755 (executable)
--- a/src/power/power_api.js
+++ b/src/power/power_api.js
@@ -15,7 +15,6 @@
  */
 
 var validator_ = xwalk.utils.validator;
-var privilege_ = xwalk.utils.privilege;
 var types_ = validator_.Types;
 var native_ = new xwalk.utils.NativeManager(extension);
 
@@ -121,8 +120,6 @@ function PowerManager() {
  *     is desired to be.
  */
 PowerManager.prototype.request = function(resource, state) {
-   xwalk.utils.checkPrivilegeAccess(privilege_.POWER);
-
    var args = validator_.validateArgs(arguments, [
         {'name' : 'resource', 'type': types_.ENUM, 'values' : ['SCREEN', 'CPU']},
         {'name' : 'state', 'type': types_.ENUM, 'values' : ['SCREEN_OFF', 'SCREEN_DIM', 'SCREEN_NORMAL', 'SCREEN_BRIGHT', 'CPU_AWAKE']}
@@ -216,8 +213,6 @@ PowerManager.prototype.getScreenBrightness = function() {
  * @param {!number} brightness The screen brightness value to set.
  */
 PowerManager.prototype.setScreenBrightness = function(brightness) {
-    xwalk.utils.checkPrivilegeAccess(privilege_.POWER);
-
     var args = validator_.validateArgs(arguments, [
         {'name' : 'brightness', 'type': types_.DOUBLE}
     ]);
@@ -274,8 +269,6 @@ PowerManager.prototype.restoreScreenBrightness = function() {
  * Turns on the screen.
  */
 PowerManager.prototype.turnScreenOn = function() {
-    xwalk.utils.checkPrivilegeAccess(privilege_.POWER);
-
     var nativeParam = {
     };
 
@@ -291,8 +284,6 @@ PowerManager.prototype.turnScreenOn = function() {
  * Turns off the screen.
  */
 PowerManager.prototype.turnScreenOff = function() {
-    xwalk.utils.checkPrivilegeAccess(privilege_.POWER);
-
     var nativeParam = {
     };
 

diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc
index dc6fe901a245ab7ad9833b32a7d8bff0aa716fcb..a4b566ded4bf6cd3cbb4b2a74629ce6ebabb6ade 100755 (executable)
--- a/src/power/power_instance.cc
+++ b/src/power/power_instance.cc
@@ -25,6 +25,7 @@
 #include "common/picojson.h"
 #include "common/logger.h"
 #include "common/platform_exception.h"
+#include "common/tools.h"
 
 #include "power_manager.h"
 
@@ -32,6 +33,9 @@ namespace extension {
 namespace power {
 
 namespace {
+// The privileges that required in Power API
+const std::string kPrivilegePower = "http://tizen.org/privilege/power";
+
 const std::map<std::string, PowerResource> kPowerResourceMap = {
     {"SCREEN", POWER_RESOURCE_SCREEN},
     {"CPU", POWER_RESOURCE_CPU}
@@ -94,6 +98,8 @@ enum PowerCallbacks {
 
 void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out);
+
   const std::string& resource = args.get("resource").get<std::string>();
   const std::string& state = args.get("state").get<std::string>();
 
@@ -132,6 +138,8 @@ void PowerInstance::PowerManagerGetscreenbrightness(const picojson::value& args,
 void PowerInstance::PowerManagerSetscreenbrightness(const picojson::value& args,
                                                     picojson::object& out) {
   LoggerD("Enter");
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out);
+
   CHECK_EXIST(args, "brightness", out)
 
   double brightness = args.get("brightness").get<double>();
@@ -165,6 +173,8 @@ void PowerInstance::PowerManagerRestorescreenbrightness(const picojson::value& a
 
 void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out);
+
   PlatformResult result = PowerManager::GetInstance()->SetScreenState(true);
   if (result.IsError())
     LogAndReportError(result, &out);
@@ -174,6 +184,8 @@ void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojs
 
 void PowerInstance::PowerManagerTurnscreenoff(const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out);
+
   PlatformResult result = PowerManager::GetInstance()->SetScreenState(false);
   if (result.IsError())
     LogAndReportError(result, &out);