From: Piotr Kosko <p.kosko@samsung.com>
Date: Mon, 21 Aug 2017 10:56:24 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170821.110349^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F145145%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I08b78656520b988f0860e48fdae911a83a0c649b
---

0f19480f5c28350e010782bea6d457ef27a8e9f6
diff --cc src/sensor/sensor_service.cc
index 95fe2fc6,71a3ab25..9e3164af
--- a/src/sensor/sensor_service.cc
+++ b/src/sensor/sensor_service.cc
@@@ -818,18 -817,17 +835,19 @@@ SensorService::SensorService(SensorInst
      : instance_(instance) {
    LoggerD("Entered");
  
-   AddSensor(new SensorData(instance, SENSOR_LIGHT, "LIGHT"));
-   AddSensor(new SensorData(instance, SENSOR_MAGNETIC, "MAGNETIC", MagneticEventComparator));
-   AddSensor(new SensorData(instance, SENSOR_PRESSURE, "PRESSURE"));
-   AddSensor(new SensorData(instance, SENSOR_PROXIMITY, "PROXIMITY"));
-   AddSensor(new SensorData(instance, SENSOR_ULTRAVIOLET, "ULTRAVIOLET"));
+   // For amount of retrieved values from sensors please refer to native guides.
+   AddSensor(new SensorData(instance, SENSOR_LIGHT, "LIGHT", 1));
+   AddSensor(new SensorData(instance, SENSOR_MAGNETIC, "MAGNETIC", 3, MagneticEventComparator));
+   AddSensor(new SensorData(instance, SENSOR_PRESSURE, "PRESSURE", 1));
+   AddSensor(new SensorData(instance, SENSOR_PROXIMITY, "PROXIMITY", 1));
+   AddSensor(new SensorData(instance, SENSOR_ULTRAVIOLET, "ULTRAVIOLET", 1));
    AddSensor(new HrmSensorData(instance));
-   AddSensor(new SensorData(instance, SENSOR_GRAVITY, "GRAVITY"));
-   AddSensor(new SensorData(instance, SENSOR_GYROSCOPE, "GYROSCOPE"));
-   AddSensor(new SensorData(instance, SENSOR_GYROSCOPE_ROTATION_VECTOR, "GYROSCOPE_ROTATION_VECTOR"));
-   AddSensor(new SensorData(instance, SENSOR_LINEAR_ACCELERATION, "LINEAR_ACCELERATION"));
-   AddSensor(new SensorData(instance, SENSOR_GEOMAGNETIC_UNCALIBRATED, "MAGNETIC_UNCALIBRATED"));
-   AddSensor(new SensorData(instance, SENSOR_GYROSCOPE_UNCALIBRATED, "GYROSCOPE_UNCALIBRATED"));
+   AddSensor(new SensorData(instance, SENSOR_GRAVITY, "GRAVITY", 3));
+   AddSensor(new SensorData(instance, SENSOR_GYROSCOPE, "GYROSCOPE", 3));
+   AddSensor(new SensorData(instance, SENSOR_GYROSCOPE_ROTATION_VECTOR, "GYROSCOPE_ROTATION_VECTOR", 4));
+   AddSensor(new SensorData(instance, SENSOR_LINEAR_ACCELERATION, "LINEAR_ACCELERATION", 3));
++  AddSensor(new SensorData(instance, SENSOR_GEOMAGNETIC_UNCALIBRATED, "MAGNETIC_UNCALIBRATED", 6));
++  AddSensor(new SensorData(instance, SENSOR_GYROSCOPE_UNCALIBRATED, "GYROSCOPE_UNCALIBRATED", 6));
  }
  
  SensorService::~SensorService() {