From 0dd1d31aa29e45093738fb2f0d546b6b80d64620 Mon Sep 17 00:00:00 2001 From: Hyunjin Park Date: Thu, 3 Mar 2016 19:23:15 +0900 Subject: [PATCH] [sensor] patch from IM department ------------------------------------- [Sensor] Fixed the proximity sensor value [model] Z3 [binary_type] AP [customer] N/A [issue#] N/A [problem] Proximity sensor sends FAR status when any object is close to the sensor and NEAR status when nothing overlays it. The status is inverted. [cause] Logic error in web device api plugin. [solution] Fixed that the Proximity sensor sends NEAR status when any object is close to the sensor and FAR status when nothing overlays it. [team] AdvancedWearable [request] N/A [horizontal_expansion] N/A Change-Id: Ide485d61fe99ca87d1f81de572b5bb21963f3eab --- src/sensor/sensor_service.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sensor/sensor_service.cc b/src/sensor/sensor_service.cc index 5cc056f0..bc076bb2 100644 --- a/src/sensor/sensor_service.cc +++ b/src/sensor/sensor_service.cc @@ -86,8 +86,7 @@ void ReportSensorData(sensor_type_e sensor_type, sensor_event_s* sensor_event, break; } case SENSOR_PROXIMITY: { - const int state = static_cast(sensor_event->values[0]); - (*out)["proximityState"] = picojson::value(state ? "NEAR" : "FAR"); + (*out)["proximityState"] = picojson::value(SENSOR_PROXIMITY_NEAR == state ? "NEAR" : "FAR"); break; } case SENSOR_ULTRAVIOLET: { -- 2.34.1