commit bab0c7efe38976e532580334c00ea203775db31d
author Brian Duddie <bduddie@google.com> Fri Aug 02 19:40:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 02 19:40:55 2019 -0700
tree 6b142d2ced74bc9484bd64eb43f0847fbdcc1fb4
parent 86063dc8da4a3d4b7de2bce167aaf14a44f3da0a
parent 8813be6341051258bfb4c49642dc3300796b0e6c

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

Change-Id: Ie652236cdbd4734dc723fac8c27ca876161f623d

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