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

Commit 1bb718ba authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[hardware][interfaces][gnss] fix -Wreorder-init-list" 

am: d2e8d0b5

Change-Id: Iee8c0aa77b4559f656e0f19cbbe786ca200e8584
parents 718ac655 d2e8d0b5

gnss/1.0/default/Gnss.cpp

+14 −14
Original line number Diff line number Diff line
@@ -129,19 +129,19 @@ void Gnss::gnssSvStatusCb(GnssSvStatus* status) { 
        auto svInfo = status->gnss_sv_list[i];

        IGnssCallback::GnssSvInfo gnssSvInfo = {

                .svid = svInfo.svid,

            .constellation = static_cast<

                android::hardware::gnss::V1_0::GnssConstellationType>(

                .constellation = static_cast<android::hardware::gnss::V1_0::GnssConstellationType>(

                        svInfo.constellation),

                .cN0Dbhz = svInfo.c_n0_dbhz,

                .elevationDegrees = svInfo.elevation,

                .azimuthDegrees = svInfo.azimuth,

                .carrierFrequencyHz = 0,

                // Older chipsets do not provide carrier frequency, hence

                // HAS_CARRIER_FREQUENCY flag and the carrierFrequencyHz fields

                // are not set. So we are resetting both fields here.

                .svFlag = static_cast<uint8_t>(

                svInfo.flags &= ~(static_cast<uint8_t>(

                    IGnssCallback::GnssSvFlags::HAS_CARRIER_FREQUENCY))),

            .carrierFrequencyHz = 0};

                        svInfo.flags &=

                        ~(static_cast<uint8_t>(IGnssCallback::GnssSvFlags::HAS_CARRIER_FREQUENCY))),

        };

        svStatus.gnssSvList[i] = gnssSvInfo;

    }

gnss/2.0/default/GnssMeasurement.cpp

+3 −2
Original line number Diff line number Diff line
@@ -119,12 +119,13 @@ GnssData GnssMeasurement::getMockMeasurement() { 
    V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = {

            .v1_1 = measurement_1_1,

            .codeType = "C",

            .constellation = GnssConstellationType::GLONASS,

            .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};

                     GnssMeasurementState::STATE_GLO_TOD_DECODED,

            .constellation = GnssConstellationType::GLONASS,

    };



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

    measurements[0] = measurement_2_0;