diff options
| author | 2020-02-03 19:32:43 +0000 | |
|---|---|---|
| committer | 2020-02-03 19:32:43 +0000 | |
| commit | 429b68962e46bd09869b26aad850cd1a31ab3f66 (patch) | |
| tree | 6ea32b5dcf8c044d48a7a22140532e0fb02a6460 | |
| parent | 31c36d4b7dfca1b763af1e91243fa597eed4d684 (diff) | |
| parent | bcb2274d8dfbda88db7d7b4ca073990a68286d30 (diff) | |
Merge "Fix ISB field names in JNI"
| -rw-r--r-- | services/core/jni/com_android_server_location_GnssLocationProvider.cpp | 10 |
1 files 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); } } |