diff options
Diffstat (limited to 'android/2.1/location_api/GnssAPIClient.cpp')
| -rw-r--r-- | android/2.1/location_api/GnssAPIClient.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/android/2.1/location_api/GnssAPIClient.cpp b/android/2.1/location_api/GnssAPIClient.cpp index 93d5302..c3a4665 100644 --- a/android/2.1/location_api/GnssAPIClient.cpp +++ b/android/2.1/location_api/GnssAPIClient.cpp @@ -416,20 +416,23 @@ void GnssAPIClient::onCapabilitiesCb(LocationCapabilitiesMask capabilitiesMask) if (capabilitiesMask & LOCATION_CAPABILITIES_MEASUREMENTS_CORRECTION_BIT) data |= V2_0::IGnssCallback::Capabilities::MEASUREMENT_CORRECTIONS; - IGnssCallback::GnssSystemInfo gnssInfo; - if (capabilitiesMask & LOCATION_CAPABILITIES_MEASUREMENTS_CORRECTION_BIT) { - gnssInfo.yearOfHw = 2020; - } else if (capabilitiesMask & LOCATION_CAPABILITIES_PRIVACY_BIT) { - gnssInfo.yearOfHw = 2019; - } else if (capabilitiesMask & LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT || - capabilitiesMask & LOCATION_CAPABILITIES_AGPM_BIT) { - gnssInfo.yearOfHw = 2018; - } else if (capabilitiesMask & LOCATION_CAPABILITIES_DEBUG_NMEA_BIT) { - gnssInfo.yearOfHw = 2017; - } else if (capabilitiesMask & LOCATION_CAPABILITIES_GNSS_MEASUREMENTS_BIT) { - gnssInfo.yearOfHw = 2016; - } else { - gnssInfo.yearOfHw = 2015; + IGnssCallback::GnssSystemInfo gnssInfo = { .yearOfHw = 2015 }; + + if (capabilitiesMask & LOCATION_CAPABILITIES_GNSS_MEASUREMENTS_BIT) { + gnssInfo.yearOfHw++; // 2016 + if (capabilitiesMask & LOCATION_CAPABILITIES_DEBUG_NMEA_BIT) { + gnssInfo.yearOfHw++; // 2017 + if (capabilitiesMask & LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT || + capabilitiesMask & LOCATION_CAPABILITIES_AGPM_BIT) { + gnssInfo.yearOfHw++; // 2018 + if (capabilitiesMask & LOCATION_CAPABILITIES_PRIVACY_BIT) { + gnssInfo.yearOfHw++; // 2019 + if (capabilitiesMask & LOCATION_CAPABILITIES_MEASUREMENTS_CORRECTION_BIT) { + gnssInfo.yearOfHw++; // 2020 + } + } + } + } } LOC_LOGV("%s:%d] set_system_info_cb (%d)", __FUNCTION__, __LINE__, gnssInfo.yearOfHw); |