diff options
author | Griff Hazen <griff@google.com> | 2014-08-28 17:02:50 -0700 |
---|---|---|
committer | Griff Hazen <griff@google.com> | 2014-08-28 17:02:50 -0700 |
commit | f0f67e6af93a601546b1d915b147dda5da295a1f (patch) | |
tree | df164659f77c7cbc5d9b069c6deb15ef2a51803f /include | |
parent | 0f519a9e5ede300ba9fe5f307700585d33564982 (diff) | |
parent | 38014a7c819ae81bbc5f92b0f43ebd464faa4a97 (diff) | |
download | hardware_libhardware-f0f67e6af93a601546b1d915b147dda5da295a1f.zip hardware_libhardware-f0f67e6af93a601546b1d915b147dda5da295a1f.tar.gz hardware_libhardware-f0f67e6af93a601546b1d915b147dda5da295a1f.tar.bz2 |
Merge commit '38014a7c' into lmp-dev
Conflicts:
include/hardware/sensors.h
Change-Id: I21517f717761af7f52c003d535e86059ebb75f05
Diffstat (limited to 'include')
-rw-r--r-- | include/hardware/sensors.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h index 495828a..a44c155 100644 --- a/include/hardware/sensors.h +++ b/include/hardware/sensors.h @@ -495,9 +495,11 @@ enum { * * Because this sensor is on-change, events must be generated when and only * when heart_rate.bpm or heart_rate.status have changed since the last - * event. The event should be generated no faster than every period_ns passed - * to setDelay() or to batch(). See the definition of the on-change reporting - * mode for more information. + * event. In particular, upon the first activation, unless the device is known + * to not be on the body, the status field of the first event must be set to + * SENSOR_STATUS_UNRELIABLE. The event should be generated no faster than every + * period_ns passed to setDelay() or to batch(). + * See the definition of the on-change reporting mode for more information. * * sensor_t.requiredPermission must be set to SENSOR_PERMISSION_BODY_SENSORS. * |