diff options
| author | Dante Russo <drusso@codeaurora.org> | 2018-06-04 16:55:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-06 22:30:51 -0700 |
| commit | f5117fb962dd54a2e45bf703038481c0986dc21d (patch) | |
| tree | a9d6a511bc60c01550d376024fdba7d354e0bc21 | |
| parent | 50a9c31169fbd60a158be8a0b58fe427a6d87ca1 (diff) | |
| download | android_hardware_qcom_sdm845_gps-f5117fb962dd54a2e45bf703038481c0986dc21d.tar.gz android_hardware_qcom_sdm845_gps-f5117fb962dd54a2e45bf703038481c0986dc21d.tar.bz2 android_hardware_qcom_sdm845_gps-f5117fb962dd54a2e45bf703038481c0986dc21d.zip | |
Report yearOfHw=2018 when P features are supported
Support of features AGPM or Constellation Control
mean that we report yearOfHW as 2018
Change-Id: I01b7a3ce7f8b38569cf419cf07fef1d55da5f149
CRs-fixed: 2254698
| -rw-r--r-- | sdm845/android/location_api/GnssAPIClient.cpp | 5 | ||||
| -rw-r--r-- | sdm845/gnss/GnssAdapter.cpp | 6 | ||||
| -rw-r--r-- | sdm845/location/LocationAPI.h | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sdm845/android/location_api/GnssAPIClient.cpp b/sdm845/android/location_api/GnssAPIClient.cpp index 7296093..076880e 100644 --- a/sdm845/android/location_api/GnssAPIClient.cpp +++ b/sdm845/android/location_api/GnssAPIClient.cpp @@ -319,8 +319,11 @@ void GnssAPIClient::onCapabilitiesCb(LocationCapabilitiesMask capabilitiesMask) } if (gnssCbIface != nullptr) { IGnssCallback::GnssSystemInfo gnssInfo; - if (capabilitiesMask & LOCATION_CAPABILITIES_DEBUG_NMEA_BIT) { + 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 { diff --git a/sdm845/gnss/GnssAdapter.cpp b/sdm845/gnss/GnssAdapter.cpp index 9fec3b7..a691cfe 100644 --- a/sdm845/gnss/GnssAdapter.cpp +++ b/sdm845/gnss/GnssAdapter.cpp @@ -1855,6 +1855,12 @@ GnssAdapter::getCapabilities() if (mLocApi->isFeatureSupported(LOC_SUPPORTED_FEATURE_DEBUG_NMEA_V02)) { mask |= LOCATION_CAPABILITIES_DEBUG_NMEA_BIT; } + if (mLocApi->isFeatureSupported(LOC_SUPPORTED_FEATURE_CONSTELLATION_ENABLEMENT_V02)) { + mask |= LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT; + } + if (mLocApi->isFeatureSupported(LOC_SUPPORTED_FEATURE_AGPM_V02)) { + mask |= LOCATION_CAPABILITIES_AGPM_BIT; + } return mask; } diff --git a/sdm845/location/LocationAPI.h b/sdm845/location/LocationAPI.h index 31f8412..cc9ddc1 100644 --- a/sdm845/location/LocationAPI.h +++ b/sdm845/location/LocationAPI.h @@ -142,7 +142,11 @@ typedef enum { // supports debug nmea sentences in the debugNmeaCallback LOCATION_CAPABILITIES_DEBUG_NMEA_BIT = (1<<8), // support outdoor trip batching - LOCATION_CAPABILITIES_OUTDOOR_TRIP_BATCHING_BIT = (1<<9) + LOCATION_CAPABILITIES_OUTDOOR_TRIP_BATCHING_BIT = (1<<9), + // support constellation enablement + LOCATION_CAPABILITIES_CONSTELLATION_ENABLEMENT_BIT = (1<<10), + // support agpm + LOCATION_CAPABILITIES_AGPM_BIT = (1<<11), } LocationCapabilitiesBits; typedef enum { |