commit 93d6c13f8e4a2babe959bab6a68f03fba7af8fb3
author Brian Duddie <bduddie@google.com> Fri Aug 02 19:51:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 02 19:51:41 2019 -0700
tree 6b142d2ced74bc9484bd64eb43f0847fbdcc1fb4
parent 7063c1b00e6a7aa3db71b2a67e26dfe6992c9ec5
parent bab0c7efe38976e532580334c00ea203775db31d

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

Change-Id: I8a1cbcd07455bf945f4eeabbf10ed4c677989f31

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);
                            }