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

Commit c0815b53 authored by Wyatt Riley's avatar Wyatt Riley Committed by android-build-merger
Browse files

Merge "Setting clock flags for GPS clock" into oc-mr1-dev am: 67be3e2f 

am: 0c254185

Change-Id: Idb5c9982bd718b161e01fa32bc4d44aea1dfa2d1
parents cc52092e 0c254185

gnss/1.0/default/GnssMeasurement.cpp

+1 −2
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ void GnssMeasurement::gpsMeasurementCb(GpsData* gpsData) { 


    auto clockVal = gpsData->clock;

    static uint32_t discontinuity_count_to_handle_old_clock_type = 0;

    auto flags = clockVal.flags;



    gnssData.clock.leapSecond = clockVal.leap_second;

    /*
@@ -205,7 +204,7 @@ void GnssMeasurement::gpsMeasurementCb(GpsData* gpsData) { 
            break;

        case GPS_CLOCK_TYPE_GPS_TIME:

            // GPS time, need to convert.

            flags |= GPS_CLOCK_HAS_FULL_BIAS;

            clockVal.flags |= GPS_CLOCK_HAS_FULL_BIAS;

            clockVal.full_bias_ns = clockVal.time_ns;

            clockVal.time_ns = 0;

            gnssData.clock.hwClockDiscontinuityCount =