diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-03-28 14:06:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-28 14:06:12 -0700 |
| commit | af57363c10827ecb183bf4a576a24241f67294cd (patch) | |
| tree | 9bd7439b984b4155d30317c42c6da37837b83307 /android/2.0 | |
| parent | 01869b4004179870db2160ed41283dce7fbbdcde (diff) | |
| parent | 4b9768f09111fac44fe5974555a9b456728d85c1 (diff) | |
| download | gps-af57363c10827ecb183bf4a576a24241f67294cd.tar.gz | |
Merge "Move Legacy targets to GNSS HIDL 2.0"
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 244bd9c..2000bb8 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 4033147..cd88649 100644 --- a/android/2.0/Gnss.cpp +++ b/android/2.0/Gnss.cpp @@ -413,9 +413,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() { @@ -476,9 +480,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() { |