diff options
| author | Yu-Han Yang <yuhany@google.com> | 2019-02-01 19:58:04 -0800 |
|---|---|---|
| committer | Yu-Han Yang <yuhany@google.com> | 2019-02-01 20:01:34 -0800 |
| commit | 031738baa645963f673b73985dfc570193715318 (patch) | |
| tree | cfb189f3a0d422f068b5a27dc97f7b98bceb8610 /gnss | |
| parent | 7a7e837c47c854b384890b811f1ab33587d6aee7 (diff) | |
| download | android_hardware_interfaces-031738baa645963f673b73985dfc570193715318.tar.gz android_hardware_interfaces-031738baa645963f673b73985dfc570193715318.tar.bz2 android_hardware_interfaces-031738baa645963f673b73985dfc570193715318.zip | |
Use V2_0 GnssMeasurement.state in default implementation
Bug: 123297074
Test: tested on cuttlefish
Change-Id: Ia4479a3f3bf6f962acdebf9cf01ec5cbeab5fff7
Diffstat (limited to 'gnss')
| -rw-r--r-- | gnss/2.0/default/GnssMeasurement.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnss/2.0/default/GnssMeasurement.cpp b/gnss/2.0/default/GnssMeasurement.cpp index 2d34b2044..0f707b4d4 100644 --- a/gnss/2.0/default/GnssMeasurement.cpp +++ b/gnss/2.0/default/GnssMeasurement.cpp @@ -26,7 +26,7 @@ namespace implementation { using GnssConstellationType = V1_0::GnssConstellationType; using GnssMeasurementFlags = V1_0::IGnssMeasurementCallback::GnssMeasurementFlags; -using GnssMeasurementState = V1_0::IGnssMeasurementCallback::GnssMeasurementState; +using GnssMeasurementState = V2_0::IGnssMeasurementCallback::GnssMeasurementState; sp<V2_0::IGnssMeasurementCallback> GnssMeasurement::sCallback = nullptr; @@ -97,11 +97,6 @@ GnssData GnssMeasurement::getMockMeasurement() { .svid = (int16_t)6, .constellation = GnssConstellationType::GLONASS, .timeOffsetNs = 0.0, - .state = GnssMeasurementState::STATE_CODE_LOCK | GnssMeasurementState::STATE_BIT_SYNC | - GnssMeasurementState::STATE_SUBFRAME_SYNC | - GnssMeasurementState::STATE_TOW_DECODED | - GnssMeasurementState::STATE_GLO_STRING_SYNC | - GnssMeasurementState::STATE_GLO_TOD_DECODED, .receivedSvTimeInNs = 8195997131077, .receivedSvTimeUncertaintyInNs = 15, .cN0DbHz = 30.0, @@ -115,9 +110,15 @@ GnssData GnssMeasurement::getMockMeasurement() { .multipathIndicator = V1_0::IGnssMeasurementCallback::GnssMultipathIndicator::INDICATOR_UNKNOWN}; V1_1::IGnssMeasurementCallback::GnssMeasurement measurement_1_1 = {.v1_0 = measurement_1_0}; - V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = {.v1_1 = measurement_1_1, + V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = { + .v1_1 = measurement_1_1, .codeType = IGnssMeasurementCallback::GnssMeasurementCodeType::C, - .otherCodeTypeName = ""}; + .otherCodeTypeName = "", + .state = GnssMeasurementState::STATE_CODE_LOCK | GnssMeasurementState::STATE_BIT_SYNC | + GnssMeasurementState::STATE_SUBFRAME_SYNC | + GnssMeasurementState::STATE_TOW_DECODED | + GnssMeasurementState::STATE_GLO_STRING_SYNC | + GnssMeasurementState::STATE_GLO_TOD_DECODED}; hidl_vec<IGnssMeasurementCallback::GnssMeasurement> measurements(1); measurements[0] = measurement_2_0; |