commit 8b34aa638c2b46c9b80cfdedca085fa437f8417f
author Vishal Agarwal <agarwalvishal@google.com> Tue Aug 27 06:41:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 06:41:44 2019 -0700
tree 096e4787685089d94e64e36d661c8129ddfe412c
parent 56af492db3e410b916e8773a6f18d0c45778c9c4
parent 039eca1adc0684d6f82c5014556f575cfc63ba12

Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-dev
am: 039eca1adc

Change-Id: I87d59f633026d34364de61e7d3f7b33981b385ed

sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp

diff --git a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
index 5e2d9c1..66d7154 100644
--- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
+++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -775,7 +775,12 @@
     activateAllSensors(false /* enable */);
     for (const SensorInfo& sensor : getSensorsList()) {
         // Call batch on inactive sensor
-        ASSERT_EQ(batch(sensor.sensorHandle, sensor.minDelay, 0 /* maxReportLatencyNs */),
+        // One shot sensors have minDelay set to -1 which is an invalid
+        // parameter. Use 0 instead to avoid errors.
+        int64_t samplingPeriodNs = extractReportMode(sensor.flags) == SensorFlagBits::ONE_SHOT_MODE
+                                           ? 0
+                                           : sensor.minDelay;
+        ASSERT_EQ(batch(sensor.sensorHandle, samplingPeriodNs, 0 /* maxReportLatencyNs */),
                   Result::OK);
 
         // Activate the sensor