From: Piotr Kosko
Date: Wed, 4 Nov 2015 11:02:45 +0000 (+0100)
Subject: Revert "[sound] - Checking privileges moved to JS layer"
X-Git-Tag: submit/tizen_mobile/20151215.080542^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0944befd2cf798080ca08596cf01b16755bce7a8;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git
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
---
diff --git a/src/sound/sound_api.js b/src/sound/sound_api.js
index d66a4896..10cfc851 100644
--- 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 92d517c3..544d7fa6 100644
--- 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());
if (status.IsSuccess()) {