From 7656285551870fc982e17ee300e3ba57b7cafe8d Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Wed, 10 Oct 2018 16:48:02 +0200
Subject: msm8996-common: gps: Update from LA.UM.7.2.r1-04000-sdm660.0

* The vendor blobs from LA.UM.7.2.r1-04000-sdm660.0 - B2N_sprout:9/PPR1.180610.011/00WW_3_22C
* Update gnsspps from CAF's location repo

Change-Id: I6afc29a05459bf6d1951cb36b746d8cc781bc48f
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 gps/android/GnssMeasurement.h | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'gps/android/GnssMeasurement.h')

diff --git a/gps/android/GnssMeasurement.h b/gps/android/GnssMeasurement.h
index 5073169..373f0d0 100644
--- a/gps/android/GnssMeasurement.h
+++ b/gps/android/GnssMeasurement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  * Not a Contribution
  */
 /*
@@ -21,17 +21,18 @@
 #ifndef ANDROID_HARDWARE_GNSS_V1_1_GNSSMEASUREMENT_H
 #define ANDROID_HARDWARE_GNSS_V1_1_GNSSMEASUREMENT_H
 
-#include <android/hardware/gnss/1.0/IGnssMeasurement.h>
+#include <android/hardware/gnss/1.1/IGnssMeasurement.h>
+#include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 
 namespace android {
 namespace hardware {
 namespace gnss {
-namespace V1_0 {
+namespace V1_1 {
 namespace implementation {
 
-using ::android::hardware::gnss::V1_0::IGnssMeasurement;
-using ::android::hardware::gnss::V1_0::IGnssMeasurementCallback;
+using ::android::hardware::gnss::V1_1::IGnssMeasurement;
+using ::android::hardware::gnss::V1_1::IGnssMeasurementCallback;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
@@ -47,10 +48,15 @@ struct GnssMeasurement : public IGnssMeasurement {
      * Methods from ::android::hardware::gnss::V1_0::IGnssMeasurement follow.
      * These declarations were generated from IGnssMeasurement.hal.
      */
-    Return<GnssMeasurementStatus> setCallback(
-        const sp<IGnssMeasurementCallback>& callback) override;
+    Return<GnssMeasurement::GnssMeasurementStatus> setCallback(
+        const sp<V1_0::IGnssMeasurementCallback>& callback) override;
     Return<void> close() override;
 
+    // Methods from ::android::hardware::gnss::V1_1::IGnssMeasurement follow.
+    Return<GnssMeasurement::GnssMeasurementStatus> setCallback_1_1(
+            const sp<IGnssMeasurementCallback>& callback,
+            bool enableFullTracking) override;
+
  private:
     struct GnssMeasurementDeathRecipient : hidl_death_recipient {
         GnssMeasurementDeathRecipient(sp<GnssMeasurement> gnssMeasurement) :
@@ -63,12 +69,13 @@ struct GnssMeasurement : public IGnssMeasurement {
 
  private:
     sp<GnssMeasurementDeathRecipient> mGnssMeasurementDeathRecipient = nullptr;
-    sp<IGnssMeasurementCallback> mGnssMeasurementCbIface = nullptr;
+    sp<V1_0::IGnssMeasurementCallback> mGnssMeasurementCbIface = nullptr;
+    sp<IGnssMeasurementCallback> mGnssMeasurementCbIface_1_1 = nullptr;
     MeasurementAPIClient* mApi;
 };
 
 }  // namespace implementation
-}  // namespace V1_0
+}  // namespace V1_1
 }  // namespace gnss
 }  // namespace hardware
 }  // namespace android
-- 
cgit v1.2.3