commit | 0df0bdd4773567c430aed2591ee66bd349ecafe5 | [log] [tgz] |
---|---|---|
author | Brian Duddie <bduddie@google.com> | Fri Aug 02 15:06:20 2019 -0700 |
committer | Anthony Stange <stange@google.com> | Thu Oct 31 09:13:41 2019 -0400 |
tree | d9784da058e64295f9598557545d7b09f7c4c8c2 | |
parent | b7bb0a2bf2344e548021e2f369db25cb5b9d2c9e [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 91b4fa5..d835464 100644 --- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp +++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -874,7 +874,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); }