commit 35c1e6960b3ff8d9634e2290e14f2e3adabb93fa
author Peng Xu <pengxu@google.com> Wed Apr 26 17:42:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 26 17:42:34 2017 +0000
tree 3a4545daa0b9182871c70a49840c7a336b55a579
parent fe0cac23cb0bcc1d975115fac41ea9e8a0ec0024
parent d8a5ce39101f569f6bdab696ed02623e5aff7451

Merge "Sensor: Limit delay to maximum possible value before sending to HAL" into oc-dev

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 26f9143..cd1d1b0 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -1249,6 +1249,12 @@
             handle, connection.get());
     }
 
+    // Check maximum delay for the sensor.
+    nsecs_t maxDelayNs = sensor->getSensor().getMaxDelay() * 1000;
+    if (maxDelayNs > 0 && (samplingPeriodNs > maxDelayNs)) {
+        samplingPeriodNs = maxDelayNs;
+    }
+
     nsecs_t minDelayNs = sensor->getSensor().getMinDelayNs();
     if (samplingPeriodNs < minDelayNs) {
         samplingPeriodNs = minDelayNs;