Revert "[sound] - Checking privileges moved to JS layer"

This reverts commit c113c9108f09cabcded9a743e1bde62b131ad5d3.

[Verification] TCT passrate is 100%

Change-Id: Ia3a4258674af38e8c86db3921ae66463638d904c
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/sound/sound_api.js b/src/sound/sound_api.js
index d66a489656471e9fd11ad7e3e6abbd7a85804f4e..10cfc8514693303c6598f27a76955c6897f8e3b0 100644 (file)
--- a/src/sound/sound_api.js
+++ b/src/sound/sound_api.js
@@ -18,7 +18,6 @@ var utils_ = xwalk.utils;
 var type_ = utils_.type;
 var converter_ = utils_.converter;
 var validator_ = utils_.validator;
-var privilege_ = utils_.privilege;
 var types_ = validator_.Types;
 var native_ = new xwalk.utils.NativeManager(extension);
 
@@ -109,8 +108,6 @@ SoundManager.prototype.getSoundMode = function() {
 };
 
 SoundManager.prototype.setVolume = function(type, volume) {
-  utils_.checkPrivilegeAccess(privilege_.VOLUME_SET);
-
   var args = validator_.validateArgs(arguments, [
     {name: 'type', type: types_.ENUM, values: Object.keys(SoundType)},
     {name: 'volume', type: types_.DOUBLE}

diff --git a/src/sound/sound_instance.cc b/src/sound/sound_instance.cc
index 92d517c34d72f3d1029310c088e38de7e34499e6..544d7fa6e19100bfee0fd70682b7034bc16f96fe 100644 (file)
--- a/src/sound/sound_instance.cc
+++ b/src/sound/sound_instance.cc
@@ -20,12 +20,19 @@
 
 #include "common/picojson.h"
 #include "common/logger.h"
+#include "common/tools.h"
 #include "common/platform_exception.h"
 #include "sound_manager.h"
 
 namespace extension {
 namespace sound {
 
+namespace {
+// The privileges that required in Sound API
+const std::string kPrivilegeSound = "http://tizen.org/privilege/volume.set";
+
+} // namespace
+
 using namespace common;
 using namespace extension::sound;
 
@@ -78,6 +85,7 @@ void SoundInstance::SoundManagerGetSoundMode(const picojson::value& args,
 void SoundInstance::SoundManagerSetVolume(const picojson::value& args,
                                           picojson::object& out) {
   LoggerD("Enter");
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeSound, &out);
   PlatformResult status = manager_.SetVolume(args.get<picojson::object>());
 
   if (status.IsSuccess()) {