summaryrefslogtreecommitdiff
path: root/android/2.0
diff options
context:
space:
mode:
authorSaurabh Srivastava <ssrivast@codeaurora.org>2019-04-04 13:36:47 +0530
committerSaurabh Srivastava <ssrivast@codeaurora.org>2019-04-04 16:31:53 +0530
commita6c61bde6a815aa723fd3dc144875e5758349955 (patch)
treef204374e271a104884052c3c013583f1128a93ba /android/2.0
parent3e614934d19cc55c86d5b58cea39e49c7122ac3d (diff)
downloadgps-a6c61bde6a815aa723fd3dc144875e5758349955.tar.gz
Temp compilation fix for LKG integration
CRs-Fixed: 2429432 Change-Id: I8141c5583cddbd0118b9e13ddf07534ee890372c
Diffstat (limited to 'android/2.0')
-rw-r--r--android/2.0/Gnss.cpp10
-rw-r--r--android/2.0/Gnss.h4
-rw-r--r--android/2.0/location_api/MeasurementAPIClient.cpp8
3 files changed, 19 insertions, 3 deletions
diff --git a/android/2.0/Gnss.cpp b/android/2.0/Gnss.cpp
index cd88649..43a2dbb 100644
--- a/android/2.0/Gnss.cpp
+++ b/android/2.0/Gnss.cpp
@@ -511,6 +511,16 @@ Return<bool> Gnss::injectBestLocation_2_0(
return false;
}
+Return<sp<V2_0::IGnssBatching>> Gnss::getExtensionGnssBatching_2_0() {
+ ENTRY_LOG_CALLFLOW();
+ return nullptr;
+}
+
+Return<sp<V2_0::IGnssDebug>> Gnss::getExtensionGnssDebug_2_0() {
+ ENTRY_LOG_CALLFLOW();
+ return nullptr;
+}
+
IGnss* HIDL_FETCH_IGnss(const char* hal) {
ENTRY_LOG_CALLFLOW();
IGnss* iface = nullptr;
diff --git a/android/2.0/Gnss.h b/android/2.0/Gnss.h
index dfae2a3..eefe8e0 100644
--- a/android/2.0/Gnss.h
+++ b/android/2.0/Gnss.h
@@ -121,6 +121,10 @@ struct Gnss : public IGnss {
Return<bool> injectBestLocation_2_0(const ::android::hardware::gnss::V2_0::GnssLocation& location) override;
+ Return<sp<V2_0::IGnssBatching>> getExtensionGnssBatching_2_0() override;
+ Return<sp<V2_0::IGnssDebug>> getExtensionGnssDebug_2_0() override;
+
+
/**
* This method returns the IGnssVisibilityControl interface.
*
diff --git a/android/2.0/location_api/MeasurementAPIClient.cpp b/android/2.0/location_api/MeasurementAPIClient.cpp
index 1d82139..d9cae18 100644
--- a/android/2.0/location_api/MeasurementAPIClient.cpp
+++ b/android/2.0/location_api/MeasurementAPIClient.cpp
@@ -374,9 +374,11 @@ static void convertGnssData_2_0(GnssMeasurementsNotification& in,
if (in.measurements[i].adrStateMask & GNSS_MEASUREMENTS_ACCUMULATED_DELTA_RANGE_STATE_HALF_CYCLE_RESOLVED_BIT)
out.measurements[i].v1_1.accumulatedDeltaRangeState |=
IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState::ADR_STATE_HALF_CYCLE_RESOLVED;
- out.measurements[i].codeType =
- static_cast<IGnssMeasurementCallback::GnssMeasurementCodeType>(in.measurements[i].codeType);
- out.measurements[i].otherCodeTypeName = in.measurements[i].otherCodeTypeName;
+
+// out.measurements[i].codeType =
+// static_cast<IGnssMeasurementCallback::GnssMeasurementCodeType>(in.measurements[i].codeType);
+// out.measurements[i].otherCodeTypeName = in.measurements[i].otherCodeTypeName;
+
if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_CODE_LOCK_BIT)
out.measurements[i].state |= IGnssMeasurementCallback::GnssMeasurementState::STATE_CODE_LOCK;
if (in.measurements[i].stateMask & GNSS_MEASUREMENTS_STATE_BIT_SYNC_BIT)