From 9f37d8bb5196b15b161a83235b0d13878e727de6 Mon Sep 17 00:00:00 2001
From: Mike Cailean <mcailean@codeaurora.org>
Date: Wed, 27 Mar 2019 17:43:29 -0700
Subject: [PATCH] Clean up several functions as a result of a better approach
 in GARDEn app for Privacy

Change-Id: Ia030385d5ee26305ea041258cc3fb664735983be
CRs-fixed: 2424763
---
 gnss/location_gnss.cpp           | 17 -----------------
 location/LocationAPIClientBase.h |  4 ----
 location/location_interface.h    |  1 -
 3 files changed, 22 deletions(-)

diff --git a/gnss/location_gnss.cpp b/gnss/location_gnss.cpp
index 4b2421ac..43665b44 100644
--- a/gnss/location_gnss.cpp
+++ b/gnss/location_gnss.cpp
@@ -70,7 +70,6 @@ static void updateConnectionStatus(bool connected, int8_t type, bool roaming = f
 static void getGnssEnergyConsumed(GnssEnergyConsumedCallback energyConsumedCb);
 static void enableNfwLocationAccess(bool enable);
 static void nfwInit(const NfwCbInfo& cbInfo);
-static uint8_t getGpsLock();
 static void getPowerStateChanges(void* powerStateCb);
 
 static void odcpiInit(const OdcpiRequestCallback& callback);
@@ -114,7 +113,6 @@ static const GnssInterface gGnssInterface = {
     getGnssEnergyConsumed,
     enableNfwLocationAccess,
     nfwInit,
-    getGpsLock,
     getPowerStateChanges
 };
 
@@ -369,24 +367,9 @@ static void nfwInit(const NfwCbInfo& cbInfo) {
         gGnssAdapter->initNfwCommand(cbInfo);
     }
 }
-
-static uint8_t getGpsLock() {
-    if (NULL != gGnssAdapter) {
-        return ContextBase::mGps_conf.GPS_LOCK;
-    } else {
-        /* In case gGnssAdapter is NULL
-           just return 0x3 which means both
-           AFW and NFW are locked (the bits are NFW
-           for 2^1 and AFW for 2^0) */
-        LOC_LOGe("gGnssAdapter is NULL");
-        return 0x3;
-    }
-}
-
 static void getPowerStateChanges(void* powerStateCb)
 {
     if (NULL != gGnssAdapter) {
         gGnssAdapter->getPowerStateChangesCommand(powerStateCb);
     }
 }
-
diff --git a/location/LocationAPIClientBase.h b/location/LocationAPIClientBase.h
index fd22b040..fddae604 100644
--- a/location/LocationAPIClientBase.h
+++ b/location/LocationAPIClientBase.h
@@ -36,7 +36,6 @@
 #include <map>
 
 #include "LocationAPI.h"
-#include <gps_extended_c.h>
 #include <loc_pla.h>
 #include <log_util.h>
 
@@ -253,9 +252,6 @@ public:
     inline virtual void onGnssLocationInfoCb(
             GnssLocationInfoNotification /*gnssLocationInfoNotification*/) {}
 
-    inline virtual void onGnssNfwStatusCb(
-            GnssNfwNotification /*notification*/) {}
-
     inline virtual void onBatchingCb(size_t /*count*/, Location* /*location*/,
             BatchingOptions /*batchingOptions*/) {}
     inline virtual void onBatchingStatusCb(BatchingStatusInfo /*batchingStatus*/,
diff --git a/location/location_interface.h b/location/location_interface.h
index 45c2c258..4235a137 100644
--- a/location/location_interface.h
+++ b/location/location_interface.h
@@ -85,7 +85,6 @@ struct GnssInterface {
     void (*getGnssEnergyConsumed)(GnssEnergyConsumedCallback energyConsumedCb);
     void (*enableNfwLocationAccess)(bool enable);
     void (*nfwInit)(const NfwCbInfo& cbInfo);
-    uint8_t (*getGpsLock)();
     void (*getPowerStateChanges)(void* powerStateCb);
 };