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

Commit 031738ba authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Use V2_0 GnssMeasurement.state in default implementation 

Bug: 123297074
Test: tested on cuttlefish
Change-Id: Ia4479a3f3bf6f962acdebf9cf01ec5cbeab5fff7
parent 7a7e837c

gnss/2.0/default/GnssMeasurement.cpp

+9 −8
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace implementation { 


using GnssConstellationType = V1_0::GnssConstellationType;

using GnssMeasurementFlags = V1_0::IGnssMeasurementCallback::GnssMeasurementFlags;

using GnssMeasurementState = V1_0::IGnssMeasurementCallback::GnssMeasurementState;

using GnssMeasurementState = V2_0::IGnssMeasurementCallback::GnssMeasurementState;



sp<V2_0::IGnssMeasurementCallback> GnssMeasurement::sCallback = nullptr;
@@ -97,11 +97,6 @@ GnssData GnssMeasurement::getMockMeasurement() { 
        .svid = (int16_t)6,

        .constellation = GnssConstellationType::GLONASS,

        .timeOffsetNs = 0.0,

        .state = GnssMeasurementState::STATE_CODE_LOCK | GnssMeasurementState::STATE_BIT_SYNC |

                 GnssMeasurementState::STATE_SUBFRAME_SYNC |

                 GnssMeasurementState::STATE_TOW_DECODED |

                 GnssMeasurementState::STATE_GLO_STRING_SYNC |

                 GnssMeasurementState::STATE_GLO_TOD_DECODED,

        .receivedSvTimeInNs = 8195997131077,

        .receivedSvTimeUncertaintyInNs = 15,

        .cN0DbHz = 30.0,
@@ -115,9 +110,15 @@ GnssData GnssMeasurement::getMockMeasurement() { 
        .multipathIndicator =

            V1_0::IGnssMeasurementCallback::GnssMultipathIndicator::INDICATOR_UNKNOWN};

    V1_1::IGnssMeasurementCallback::GnssMeasurement measurement_1_1 = {.v1_0 = measurement_1_0};

    V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = {.v1_1 = measurement_1_1,

    V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = {

            .v1_1 = measurement_1_1,

            .codeType = IGnssMeasurementCallback::GnssMeasurementCodeType::C,

            .otherCodeTypeName = ""};

            .otherCodeTypeName = "",

            .state = GnssMeasurementState::STATE_CODE_LOCK | GnssMeasurementState::STATE_BIT_SYNC |

                     GnssMeasurementState::STATE_SUBFRAME_SYNC |

                     GnssMeasurementState::STATE_TOW_DECODED |

                     GnssMeasurementState::STATE_GLO_STRING_SYNC |

                     GnssMeasurementState::STATE_GLO_TOD_DECODED};



    hidl_vec<IGnssMeasurementCallback::GnssMeasurement> measurements(1);

    measurements[0] = measurement_2_0;