Merge branch 'tizen_3.0' into tizen

Change-Id: I08b78656520b988f0860e48fdae911a83a0c649b

diff --cc packaging/webapi-plugins.spec
Simple merge

diff --cc src/sensor/sensor_api.js
Simple merge

diff --cc src/sensor/sensor_service.cc
index 95fe2fc6df0a6e4385be3fb7fe770228c92a828c,71a3ab25c8f5131f2364aff85c73b28391c2e292..9e3164af8c9529383dd0fe3f861cf85220b46d20
--- 1/src/sensor/sensor_service.cc
--- 2/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() {