commit d48333f6e14e85a0942422ed42a0657a27961117
author Brian Duddie <bduddie@google.com> Fri Aug 02 21:11:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 02 21:11:02 2019 -0700
tree f0426c0609aee621f4e6e9554fd298b6b1860d41
parent 3883b06ed316fc9de5603b7ed4975c8542438a65
parent 93d6c13f8e4a2babe959bab6a68f03fba7af8fb3

Merge changes from topic "c2f2_sensors_vts" into qt-r1-dev am: 8813be6341 am: bab0c7efe3
am: 93d6c13f8e

Change-Id: Id49809aa35dfafb607c8ba781e48e1357981daa6

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 9dbcf84..8364ba9 100644
--- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
+++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -911,7 +911,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);
                            }