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/GnssConfiguration.h | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

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

diff --git a/gps/android/GnssConfiguration.h b/gps/android/GnssConfiguration.h
index f46f607..1629e06 100644
--- a/gps/android/GnssConfiguration.h
+++ b/gps/android/GnssConfiguration.h
@@ -19,19 +19,19 @@
  */
 
 
-#ifndef ANDROID_HARDWARE_GNSS_V1_1_GNSSCONFIGURATION_H
-#define ANDROID_HARDWARE_GNSS_V1_1_GNSSCONFIGURATION_H
+#ifndef ANDROID_HARDWARE_GNSS_V1_0_GNSSCONFIGURATION_H
+#define ANDROID_HARDWARE_GNSS_V1_0_GNSSCONFIGURATION_H
 
-#include <android/hardware/gnss/1.1/IGnssConfiguration.h>
+#include <android/hardware/gnss/1.0/IGnssConfiguration.h>
 #include <hidl/Status.h>
 
 namespace android {
 namespace hardware {
 namespace gnss {
-namespace V1_1 {
+namespace V1_0 {
 namespace implementation {
 
-using ::android::hardware::gnss::V1_1::IGnssConfiguration;
+using ::android::hardware::gnss::V1_0::IGnssConfiguration;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
@@ -58,18 +58,14 @@ struct GnssConfiguration : public IGnssConfiguration {
     Return<bool> setEmergencySuplPdn(bool enable) override;
     Return<bool> setGpsLock(uint8_t lock) override;
 
-    // Methods from ::android::hardware::gnss::V1_1::IGnssConfiguration follow.
-    Return<bool> setBlacklist(
-            const hidl_vec<GnssConfiguration::BlacklistedSource>& blacklist) override;
-
  private:
     Gnss* mGnss = nullptr;
 };
 
 }  // namespace implementation
-}  // namespace V1_1
+}  // namespace V1_0
 }  // namespace gnss
 }  // namespace hardware
 }  // namespace android
 
-#endif  // ANDROID_HARDWARE_GNSS_V1_1_GNSSCONFIGURATION_H
+#endif  // ANDROID_HARDWARE_GNSS_V1_0_GNSSCONFIGURATION_H
-- 
cgit v1.2.3