summaryrefslogtreecommitdiffstats
path: root/gnss/2.0
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-26 20:07:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-26 20:07:58 +0000
commita86a057a8ec0bc920f168531abfb1ac955010f68 (patch)
tree8708c28291c31240dea02dffefe5def3d7ae2510 /gnss/2.0
parentfe6dec9f22f53cc144389c4e8fed01fa3a09268b (diff)
parent6df119f6a90b11f845504ffb0187f317f4c38351 (diff)
downloadplatform_hardware_interfaces-a86a057a8ec0bc920f168531abfb1ac955010f68.tar.gz
platform_hardware_interfaces-a86a057a8ec0bc920f168531abfb1ac955010f68.tar.bz2
platform_hardware_interfaces-a86a057a8ec0bc920f168531abfb1ac955010f68.zip
Merge "Fix GnssMeasurement state range check" into rvc-dev am: 6df119f6a9
Change-Id: Ic6843a2bef8d24f9ba3a5f30c2b72260c54ee768
Diffstat (limited to 'gnss/2.0')
-rw-r--r--gnss/2.0/vts/functional/gnss_hal_test_cases.cpp7
1 files 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 c93e89b843..094c7c1e54 100644
--- a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
+++ b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
@@ -223,9 +223,10 @@ TEST_P(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();