From 37f63ed771ca2f4d02ac0625b0129c80549704fc Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 10 Aug 2021 16:53:17 +0800 Subject: [PATCH] Allow negative value for CorrelationVector#samplingStartM Bug: 195934893 Test: on cuttlefish Change-Id: Ief1514c8d8e48c9c3f13b93c3d2c355a508a84a7 --- gnss/aidl/vts/gnss_hal_test_cases.cpp | 1 - gnss/common/utils/default/Utils.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gnss/aidl/vts/gnss_hal_test_cases.cpp b/gnss/aidl/vts/gnss_hal_test_cases.cpp index 5964f815a8..b484f9c383 100644 --- a/gnss/aidl/vts/gnss_hal_test_cases.cpp +++ b/gnss/aidl/vts/gnss_hal_test_cases.cpp @@ -252,7 +252,6 @@ TEST_P(GnssHalTest, TestCorrelationVector) { for (const auto& correlationVector : measurement.correlationVectors) { ASSERT_GE(correlationVector.frequencyOffsetMps, 0); ASSERT_GT(correlationVector.samplingWidthM, 0); - ASSERT_GE(correlationVector.samplingStartM, 0); ASSERT_TRUE(correlationVector.magnitude.size() > 0); for (const auto& magnitude : correlationVector.magnitude) { ASSERT_TRUE(magnitude >= -32768 && magnitude <= 32767); diff --git a/gnss/common/utils/default/Utils.cpp b/gnss/common/utils/default/Utils.cpp index d136448ed9..23e39b26ec 100644 --- a/gnss/common/utils/default/Utils.cpp +++ b/gnss/common/utils/default/Utils.cpp @@ -221,7 +221,7 @@ GnssData Utils::getMockMeasurement(const bool enableCorrVecOutputs) { aidl::android::hardware::gnss::CorrelationVector correlationVector2 = { .frequencyOffsetMps = 20, .samplingWidthM = 30, - .samplingStartM = 0, + .samplingStartM = -10, .magnitude = {0, 3000, 5000, 3000, 0, 0, 1000, 0}}; measurement.correlationVectors = {correlationVector1, correlationVector2}; measurement.flags |= GnssMeasurement::HAS_CORRELATION_VECTOR;