Temp compilation fix for LKG integration

CRs-Fixed: 2429432
Change-Id: I8141c5583cddbd0118b9e13ddf07534ee890372c

5 files changed, 27 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)
diff --git a/android/measurement_corrections/1.0/MeasurementCorrections.cpp b/android/measurement_corrections/1.0/MeasurementCorrections.cpp
index bca4c45..c1a335a 100644
--- a/android/measurement_corrections/1.0/MeasurementCorrections.cpp
+++ b/android/measurement_corrections/1.0/MeasurementCorrections.cpp
@@ -58,6 +58,10 @@ Return<bool> MeasurementCorrections::setCorrections(const ::android::hardware::g
     return true;
 }
 
+Return<bool> MeasurementCorrections::setCallback(const sp<IMeasurementCorrectionsCallback>& callback) {
+    return true;
+}
+
 }  // namespace implementation
 }  // namespace V1_0
 }  // namespace measurement_corrections
diff --git a/android/measurement_corrections/1.0/MeasurementCorrections.h b/android/measurement_corrections/1.0/MeasurementCorrections.h
index 231c534..ad534dc 100644
--- a/android/measurement_corrections/1.0/MeasurementCorrections.h
+++ b/android/measurement_corrections/1.0/MeasurementCorrections.h
@@ -31,6 +31,7 @@
 #define ANDROID_HARDWARE_GNSS_V1_0_MeasurementCorrections_H
 
 #include <android/hardware/gnss/measurement_corrections/1.0/IMeasurementCorrections.h>
+#include <android/hardware/gnss/measurement_corrections/1.0/IMeasurementCorrectionsCallback.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 
@@ -51,6 +52,7 @@ using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::sp;
 using ::android::hardware::gnss::V1_0::GnssLocation;
+using ::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrectionsCallback;
 
 struct MeasurementCorrections : public IMeasurementCorrections {
     MeasurementCorrections();
@@ -59,6 +61,8 @@ struct MeasurementCorrections : public IMeasurementCorrections {
 // Methods from ::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrections follow.
 Return<bool> setCorrections(const ::android::hardware::gnss::measurement_corrections::V1_0::MeasurementCorrections& corrections) override;
 
+Return<bool> setCallback(const sp<IMeasurementCorrectionsCallback>& callback) override;
+
 };