commit | 2321aa9502faa6e9da6868699b5e1693c8face14 | [log] [tgz] |
---|---|---|
author | Brian Duddie <bduddie@google.com> | Fri Aug 02 15:06:20 2019 -0700 |
committer | Anthony Stange <stange@google.com> | Mon Aug 26 10:01:53 2019 -0400 |
tree | c1400b6b7b586024e881b138d9f450e8c8036528 | |
parent | 5a1ad93a38cbd1e5c887489ed70596ba53837469 [diff] |
Fix handling of reportToken when stopping VTS should ignore the reportToken returned by configDirectReport when it passes in RateLevel::STOP. Bug: 138758242 Test: run direct channel tests on device using 2.0 HAL Change-Id: I07e789157e051ceab488a61e856f17d50f435072 Merged-In: I07e789157e051ceab488a61e856f17d50f435072 (cherry picked from commit 63d4f579762b8b1bba1d0e29c9959aaa838d4529)
diff --git a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp index beee566..5e2d9c1 100644 --- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp +++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -875,7 +875,9 @@ [&](Result result, int32_t reportToken) { if (isDirectReportRateSupported(sensor, rateLevel)) { ASSERT_EQ(result, Result::OK); - ASSERT_GT(reportToken, 0); + if (rateLevel != RateLevel::STOP) { + ASSERT_GT(reportToken, 0); + } } else { ASSERT_EQ(result, Result::BAD_VALUE); }