From 40c75c1ac0fa3598b678b584e80bbc2abb2e1eff Mon Sep 17 00:00:00 2001
From: Pawel Andruszkiewicz
Date: Thu, 5 Nov 2015 15:15:28 +0100
Subject: [PATCH] [Sensor] Updated implementation of privilege checks.
This also applies changes from commit 05fd709f39c12cb3a564a49a6856bf60d4aa89c6
[Verification] Code compiles without errors, unable to test on tizen3.0
Change-Id: I35c1575e8dbb238132889529d9530e0645f9782e
Signed-off-by: Pawel Andruszkiewicz
---
src/sensor/sensor_api.js | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/sensor/sensor_api.js b/src/sensor/sensor_api.js
index b6c24d1..5721bd4 100644
--- a/src/sensor/sensor_api.js
+++ b/src/sensor/sensor_api.js
@@ -14,11 +14,13 @@
* limitations under the License.
*/
-var validator_ = xwalk.utils.validator;
-var converter_ = xwalk.utils.converter;
+var utils_ = xwalk.utils;
+var privilege_ = utils_.privilege;
+var validator_ = utils_.validator;
+var converter_ = utils_.converter;
+var T_ = utils_.type;
var types_ = validator_.Types;
-var T_ = xwalk.utils.type;
-var native_ = new xwalk.utils.NativeManager(extension);
+var native_ = new utils_.NativeManager(extension);
// Enums
var SensorType = {
@@ -165,7 +167,7 @@ function getAvailableSensors() {
function SensorService() {
};
-SensorService.prototype.getDefaultSensor = function() {
+function getDefaultSensor() {
var args = validator_.validateArgs(arguments, [
{
name : 'type',
@@ -192,11 +194,15 @@ SensorService.prototype.getDefaultSensor = function() {
} else if (_supportedSensors[index] === SensorType.ULTRAVIOLET) {
return new UltravioletSensor();
} else if (_supportedSensors[index] === SensorType.HRM_RAW) {
- xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.HEALTHINFO);
+ utils_.checkPrivilegeAccess(privilege_.HEALTHINFO);
return new HRMRawSensor();
}
};
+SensorService.prototype.getDefaultSensor = function() {
+ return getDefaultSensor.apply(this, arguments);
+};
+
SensorService.prototype.getAvailableSensors = function() {
if (!_isChecked) {
getAvailableSensors();
@@ -388,7 +394,7 @@ HRMRawSensor.prototype = new Sensor();
HRMRawSensor.prototype.constructor = Sensor;
-HRMRawSensor.prototype.getHRMRawSensorData = function() {
+function getHRMRawSensorData() {
var args = validator_.validateArgs(arguments, [
{
name : 'successCallback',
@@ -402,11 +408,15 @@ HRMRawSensor.prototype.getHRMRawSensorData = function() {
}
]);
- xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.HEALTHINFO);
+ utils_.checkPrivilegeAccess(privilege_.HEALTHINFO);
_sensorListeners[this.sensorType].getData(args.successCallback, args.errorCallback);
};
+HRMRawSensor.prototype.getHRMRawSensorData = function() {
+ getHRMRawSensorData.apply(this, arguments);
+};
+
////////////////////// Sensor Data classes/////////////////////////////////////////////////////
////Base SensorData class
var SensorData = function () {
--
2.7.4