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

am: effdb89c97

Change-Id: Ie3fa0c0a3a02e58d88ecc6971ca8bb744c005103
This commit is contained in:
Vishal Agarwal 2019-08-02 19:40:33 -07:00 committed by android-build-merger
commit 7af073c790

View file

@ -790,7 +790,12 @@ TEST_F(SensorsHidlTest, Batch) {
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