Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93183c0 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge SP1A.210812.016" into stage-aosp-master

parents e988b0f6 4824f4b8

gnss/aidl/vts/gnss_hal_test_cases.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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);

gnss/common/utils/default/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;