From 3f963bb897e8c5f8c633af50c96bdb4e68a6c5a8 Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Thu, 6 Dec 2018 20:47:47 +0100
Subject: msm8996-common: gps: Switch back to 89xx tags

* Basically just remove the gnss 1.1 support
* Tag: LA.UM.7.6.r1-03100-89xx.0

Change-Id: Ie52463e60c6f6bb127e736fe3e23a8b75c044a3a
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 gps/android/location_api/MeasurementAPIClient.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'gps/android/location_api/MeasurementAPIClient.h')

diff --git a/gps/android/location_api/MeasurementAPIClient.h b/gps/android/location_api/MeasurementAPIClient.h
index 117ad54..08b4811 100644
--- a/gps/android/location_api/MeasurementAPIClient.h
+++ b/gps/android/location_api/MeasurementAPIClient.h
@@ -31,15 +31,15 @@
 #define MEASUREMENT_API_CLINET_H
 
 #include <mutex>
-#include <android/hardware/gnss/1.1/IGnssMeasurement.h>
-#include <android/hardware/gnss/1.1/IGnssMeasurementCallback.h>
+#include <android/hardware/gnss/1.0/IGnssMeasurement.h>
+#include <android/hardware/gnss/1.0/IGnssMeasurementCallback.h>
 #include <LocationAPIClientBase.h>
 #include <hidl/Status.h>
 
 namespace android {
 namespace hardware {
 namespace gnss {
-namespace V1_1 {
+namespace V1_0 {
 namespace implementation {
 
 using ::android::sp;
@@ -55,8 +55,6 @@ public:
     // for GpsMeasurementInterface
     Return<V1_0::IGnssMeasurement::GnssMeasurementStatus> measurementSetCallback(
             const sp<V1_0::IGnssMeasurementCallback>& callback);
-    Return<V1_0::IGnssMeasurement::GnssMeasurementStatus> measurementSetCallback_1_1(
-            const sp<IGnssMeasurementCallback>& callback);
     void measurementClose();
     Return<IGnssMeasurement::GnssMeasurementStatus> startTracking();
 
@@ -66,13 +64,12 @@ public:
 private:
     std::mutex mMutex;
     sp<V1_0::IGnssMeasurementCallback> mGnssMeasurementCbIface;
-    sp<IGnssMeasurementCallback> mGnssMeasurementCbIface_1_1;
 
     bool mTracking;
 };
 
 }  // namespace implementation
-}  // namespace V1_1
+}  // namespace V1_0
 }  // namespace gnss
 }  // namespace hardware
 }  // namespace android
-- 
cgit v1.2.3