commit bbe0c9d9babca1b693a5e966138a6a2e6cdaa030
author Dante Russo <drusso@codeaurora.org> Thu May 21 11:08:28 2020 -0700
committer Michael Bestas <mkbestas@lineageos.org> Wed May 31 17:54:14 2023 +0300
tree 472adddcb7d7d9657df6652c00bc3e8270a873c6
parent 9160c91d03892509e4b6f44ee97db72192267fd2

axolotl: gps: Remove gnss_vendor client registration logic

Registering for android.hardware.gnss/gnss_vendor removed
and replaced by always dynamically loading vendor enhanced
gnss hal if present.

Change-Id: I3c7a45870b2cc34806d09cf430de9d60a9f129c7
CRs-fixed: 2696395

gps/android/2.0/android.hardware.gnss@2.0-service-qti.xml

diff --git a/gps/android/2.0/android.hardware.gnss@2.0-service-qti.xml b/gps/android/2.0/android.hardware.gnss@2.0-service-qti.xml
index de82c60..ff9fb2c 100644
--- a/gps/android/2.0/android.hardware.gnss@2.0-service-qti.xml
+++ b/gps/android/2.0/android.hardware.gnss@2.0-service-qti.xml
@@ -29,7 +29,6 @@
     <hal format="hidl">
         <name>android.hardware.gnss</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IGnss/gnss_vendor</fqname>
         <fqname>@1.1::IGnss/default</fqname>
         <fqname>@2.0::IGnss/default</fqname>
     </hal>

gps/android/2.0/service.cpp

diff --git a/gps/android/2.0/service.cpp b/gps/android/2.0/service.cpp
index e484a16..f7efb18 100644
--- a/gps/android/2.0/service.cpp
+++ b/gps/android/2.0/service.cpp
@@ -60,28 +60,19 @@
 
     status = registerPassthroughServiceImplementation<IGnss>();
     if (status == OK) {
-        if (vendorEnhanced) {
     #ifdef LOC_HIDL_VERSION
-            #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
+        #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
 
-            void* libHandle = NULL;
-            vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                    dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-            if (NULL != vendorEnhancedMainMethod) {
-                (*vendorEnhancedMainMethod)(0, NULL);
-            }
-    #else
-            ALOGE("LOC_HIDL_VERSION not defined.");
-    #endif
-        } else {
-            status = registerPassthroughServiceImplementation<IGnss>("gnss_vendor");
-            if (status != OK) {
-                ALOGE("Error while registering gnss_vendor service: %d", status);
-            }
+        void* libHandle = NULL;
+        vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
+                dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
+        if (NULL != vendorEnhancedMainMethod) {
+            (*vendorEnhancedMainMethod)(0, NULL);
         }
-
+    #else
+        ALOGI("LOC_HIDL_VERSION not defined.");
+    #endif
         joinRpcThreadpool();
-
     } else {
         ALOGE("Error while registering IGnss 2.0 service: %d", status);
     }