From e95825d6dbfa247b82678cf48c85399bd4d5bc58 Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Thu, 6 Dec 2018 20:40:18 +0100
Subject: msm8996-common: Switch back to 1.0 for gnss

* This is needed with daisy blobs (msm8953)

Change-Id: Ie49efe357fcc7ad0c29596d42ad43d1f73cf4eaa
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 manifest.xml | 7 +++++--
 msm8996.mk   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 9afc9ab..12062a0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -94,12 +94,13 @@
     <hal format="hidl">
         <name>android.hardware.gnss</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.0</version>
         <interface>
             <name>IGnss</name>
             <instance>default</instance>
-            <instance>gnss_vendor</instance>
         </interface>
+        <fqname>@1.0::IGnss/default</fqname>
+        <fqname>@1.0::IGnss/gnss_vendor</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
@@ -408,6 +409,7 @@
             <name>ILocHidlGnss</name>
             <instance>gnss_vendor</instance>
         </interface>
+        <fqname>@1.2::ILocHidlGnss/gnss_vendor</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.gnss</name>
@@ -417,6 +419,7 @@
             <name>ILocHidlGnss</name>
             <instance>gnss_vendor</instance>
         </interface>
+        <fqname>@2.0::ILocHidlGnss/gnss_vendor</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.alarm</name>
diff --git a/msm8996.mk b/msm8996.mk
index f668c2e..73a1d9a 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -203,8 +203,8 @@ PRODUCT_PACKAGES += \
 
 # GPS / Location
 PRODUCT_PACKAGES += \
-    android.hardware.gnss@1.1-impl-qti \
-    android.hardware.gnss@1.1-service-qti \
+    android.hardware.gnss@1.0-impl-qti \
+    android.hardware.gnss@1.0-service-qti \
     libcurl \
     libgnss \
     libgnsspps \
-- 
cgit v1.2.3