commit 4f21df3b444cd2e36d2ee5ecef4080cb0b9268f9
author Yu-Han Yang <yuhany@google.com> Tue May 26 10:54:25 2020 -0700
committer Yu-Han Yang <yuhany@google.com> Tue May 26 21:22:42 2020 +0000
tree 3cea77fffd0ac5d0a88c3f8337c755e547d52793
parent d90a5de79135a3a0f0e65332a8a6373f4ca7f2d8

Fix GnssMeasurement state range check

Bug: 157463010
Test: atest VtsHalGnssV2_0TestTarget
Change-Id: I72f4bf1f09d6271ac6367abc3972ee7747b18155
(cherry picked from commit 51d8defb3c374aef185a6153e7acdad560d9ace1)
Merged-In: I72f4bf1f09d6271ac6367abc3972ee7747b18155

gnss/2.0/vts/functional/gnss_hal_test_cases.cpp

diff --git a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
index b42f432..13bb901 100644
--- a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
+++ b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
@@ -216,9 +216,10 @@
                 static_cast<uint32_t>(measurement.state) >=
                         static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::
                                                       STATE_UNKNOWN) &&
-                static_cast<uint32_t>(measurement.state) <=
-                        static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::
-                                                      STATE_2ND_CODE_LOCK));
+                static_cast<uint32_t>(measurement.state) <
+                        (static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::
+                                                       STATE_2ND_CODE_LOCK)
+                         << 1));
     }
 
     iGnssMeasurement->close();