From 63d4f579762b8b1bba1d0e29c9959aaa838d4529 Mon Sep 17 00:00:00 2001
From: Brian Duddie <bduddie@google.com>
Date: Fri, 2 Aug 2019 15:06:20 -0700
Subject: [PATCH] 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
---
 sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
index 73789fe161..da1268d8d2 100644
--- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
+++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -879,7 +879,9 @@ void SensorsHidlTest::checkRateLevel(const SensorInfo& sensor, int32_t directCha
                        [&](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);
                            }