From 4f21df3b444cd2e36d2ee5ecef4080cb0b9268f9 Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Tue, 26 May 2020 10:54:25 -0700
Subject: [PATCH] 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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 b42f43218d..13bb9017a6 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 @@ TEST_F(GnssHalTest, TestGnssMeasurementFields) {
                 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();