summaryrefslogtreecommitdiff
path: root/android/1.1/location_api
diff options
context:
space:
mode:
authorMike Cailean <mcailean@codeaurora.org>2019-02-04 16:28:51 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-21 21:34:40 -0800
commit4149abcc2df9ac7bd13f38cb5047053a63f7b84b (patch)
treef472abcbee65d558f9805148494a4cc870f52692 /android/1.1/location_api
parente78728024dd2b1998811478494319be07458d05e (diff)
downloadgps-4149abcc2df9ac7bd13f38cb5047053a63f7b84b.tar.gz
Measurement changes in GNSS HIDL2.0
CRs-fixed: 2385560 Change-Id: I5f4548e6df0cb8ac3f2762020dfdbb49a9022854
Diffstat (limited to 'android/1.1/location_api')
-rw-r--r--android/1.1/location_api/MeasurementAPIClient.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/android/1.1/location_api/MeasurementAPIClient.cpp b/android/1.1/location_api/MeasurementAPIClient.cpp
index 7017e52..6f25067 100644
--- a/android/1.1/location_api/MeasurementAPIClient.cpp
+++ b/android/1.1/location_api/MeasurementAPIClient.cpp
@@ -309,6 +309,18 @@ static void convertGnssData_1_1(GnssMeasurementsNotification& in,
out.measurements.resize(in.count);
for (size_t i = 0; i < in.count; i++) {
convertGnssMeasurement(in.measurements[i], out.measurements[i].v1_0);
+ if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_VALID_BIT)
+ out.measurements[i].accumulatedDeltaRangeState |=
+ IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_VALID;
+ if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_RESET_BIT)
+ out.measurements[i].accumulatedDeltaRangeState |=
+ IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_RESET;
+ if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_CYCLE_SLIP_BIT)
+ out.measurements[i].accumulatedDeltaRangeState |=
+ IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_CYCLE_SLIP;
+ if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_HALF_CYCLE_RESOLVED_BIT)
+ out.measurements[i].accumulatedDeltaRangeState |=
+ IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_HALF_CYCLE_RESOLVED;
}
convertGnssClock(in.clock, out.clock);
}