diff options
| author | Dante Russo <drusso@codeaurora.org> | 2019-03-20 13:53:08 -0700 |
|---|---|---|
| committer | Dante Russo <drusso@codeaurora.org> | 2019-03-20 13:53:08 -0700 |
| commit | 4b9768f09111fac44fe5974555a9b456728d85c1 (patch) | |
| tree | 3e6ee809b5f47b431b626f6db2a6be983e71fda0 /android/2.0 | |
| parent | de7fa11dd6af5c03969a5f544a417913eebc2f79 (diff) | |
| download | gps-4b9768f09111fac44fe5974555a9b456728d85c1.tar.gz | |
Move Legacy targets to GNSS HIDL 2.0
Legacy targets will support a subset of
GNSS HIDL 2.0 features, but will need to
stay on GNSS 1.0 Measurements
CRs-fixed: 2423825
Change-Id: I1fc5134dbf4b8fc6b1e76cced3acfeaf8bf8d581
Diffstat (limited to 'android/2.0')
| -rw-r--r-- | android/2.0/Android.mk | 5 | ||||
| -rw-r--r-- | android/2.0/Gnss.cpp | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk index 0fa50bd..6e429f0 100644 --- a/android/2.0/Android.mk +++ b/android/2.0/Android.mk @@ -24,6 +24,11 @@ LOCAL_SRC_FILES += \ location_api/BatchingAPIClient.cpp \ location_api/LocationUtil.cpp \ +ifeq ($(GNSS_HIDL_LEGACY_MEASURMENTS),true) +LOCAL_CFLAGS += \ + -DGNSS_HIDL_LEGACY_MEASURMENTS +endif + LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/location_api \ $(LOCAL_PATH)/../measurement_corrections/1.0 \ diff --git a/android/2.0/Gnss.cpp b/android/2.0/Gnss.cpp index 0a4b34b..43f8537 100644 --- a/android/2.0/Gnss.cpp +++ b/android/2.0/Gnss.cpp @@ -407,9 +407,13 @@ Return<bool> Gnss::setPositionMode_1_1(V1_0::IGnss::GnssPositionMode mode, Return<sp<V1_1::IGnssMeasurement>> Gnss::getExtensionGnssMeasurement_1_1() { ENTRY_LOG_CALLFLOW(); +#ifdef GNSS_HIDL_LEGACY_MEASURMENTS + return nullptr; +#else if (mGnssMeasurement == nullptr) mGnssMeasurement = new GnssMeasurement(); return mGnssMeasurement; +#endif } Return<sp<V1_1::IGnssConfiguration>> Gnss::getExtensionGnssConfiguration_1_1() { @@ -470,9 +474,13 @@ Return<sp<V2_0::IGnssConfiguration>> Gnss::getExtensionGnssConfiguration_2_0() { } Return<sp<V2_0::IGnssMeasurement>> Gnss::getExtensionGnssMeasurement_2_0() { ENTRY_LOG_CALLFLOW(); +#ifdef GNSS_HIDL_LEGACY_MEASURMENTS + return nullptr; +#else if (mGnssMeasurement == nullptr) mGnssMeasurement = new GnssMeasurement(); return mGnssMeasurement; +#endif } Return<sp<::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrections>> Gnss::getExtensionMeasurementCorrections() { |