From bcb2274d8dfbda88db7d7b4ca073990a68286d30 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Sun, 2 Feb 2020 13:11:29 -0800 Subject: Fix ISB field names in JNI Bug: 147500886 Test: atest GnssMeasurementRegistrationTest Change-Id: I8cd973ab62146dca694cd2f580b8c7521c3999d7 --- .../jni/com_android_server_location_GnssLocationProvider.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 12de20cc3d51..1a8f1f9f0024 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -1218,19 +1218,21 @@ void GnssMeasurementCallback::translateSingleGnssMeasurement SET(BasebandCn0DbHz, measurement_V2_1->basebandCN0DbHz); if (measurement_V2_1->flags & GnssMeasurementFlags::HAS_RECEIVER_ISB) { - SET(ReceiverInterSignalBiasNs, measurement_V2_1->receiverInterSignalBiasNs); + SET(ReceiverInterSignalBiasNanos, measurement_V2_1->receiverInterSignalBiasNs); } if (measurement_V2_1->flags & GnssMeasurementFlags::HAS_RECEIVER_ISB_UNCERTAINTY) { - SET(ReceiverInterSignalBiasUncertaintyNs, measurement_V2_1->receiverInterSignalBiasUncertaintyNs); + SET(ReceiverInterSignalBiasUncertaintyNanos, + measurement_V2_1->receiverInterSignalBiasUncertaintyNs); } if (measurement_V2_1->flags & GnssMeasurementFlags::HAS_SATELLITE_ISB) { - SET(SatelliteInterSignalBiasNs, measurement_V2_1->satelliteInterSignalBiasNs); + SET(SatelliteInterSignalBiasNanos, measurement_V2_1->satelliteInterSignalBiasNs); } if (measurement_V2_1->flags & GnssMeasurementFlags::HAS_SATELLITE_ISB_UNCERTAINTY) { - SET(SatelliteInterSignalBiasUncertaintyNs, measurement_V2_1->satelliteInterSignalBiasUncertaintyNs); + SET(SatelliteInterSignalBiasUncertaintyNanos, + measurement_V2_1->satelliteInterSignalBiasUncertaintyNs); } } -- cgit v1.2.3-59-g8ed1b