Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ADR half cycle state bug for AIDL HAL" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-01 22:28:31 +00:00
committed by Android (Google) Code Review
parent 38dc306fdd 2d17b5ed90
commit 4cafa299df
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/jni/gnss/GnssMeasurementCallback.cpp
View File

@@ -302,6 +302,10 @@ void GnssMeasurementCallbackAidl::translateSingleGnssMeasurement(JNIEnv* env,
SET(Cn0DbHz, measurement.antennaCN0DbHz);
SET(ConstellationType, static_cast<int32_t>(measurement.signalType.constellation));
// Half cycle state is reported in the AIDL version of GnssMeasurement
SET(AccumulatedDeltaRangeState,
(static_cast<int32_t>(measurement.accumulatedDeltaRangeState) |
ADR_STATE_HALF_CYCLE_REPORTED));
if (measurement.flags & static_cast<uint32_t>(GnssMeasurement::HAS_CARRIER_FREQUENCY)) {
SET(CarrierFrequencyHz, static_cast<float>(measurement.signalType.carrierFrequencyHz));
@@ -481,7 +485,7 @@ void GnssMeasurementCallbackHidl::translateSingleGnssMeasurement<
JavaObject& object) {
translateSingleGnssMeasurement(measurement_V1_1.v1_0, object);
// Set the V1_1 flag, and mark that new field has valid information for Java Layer
// Half cycle state is reported in HIDL v1.1 or newer.
SET(AccumulatedDeltaRangeState,
(static_cast<int32_t>(measurement_V1_1.accumulatedDeltaRangeState) |
ADR_STATE_HALF_CYCLE_REPORTED));