summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorHarikrishnan Hariharan <hahariha@codeaurora.org>2019-09-01 10:52:23 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2019-09-07 06:18:44 -0700
commitf4dc944333c54a5455d17b6bd7c02d2ededb6e4a (patch)
treeddda79c0d20dbbab5058372b6e129dc8b2e93103 /core
parent1209591f9428c6777ad52461f901cb4c9351d5cd (diff)
downloadgps-f4dc944333c54a5455d17b6bd7c02d2ededb6e4a.tar.gz
Make use of USE_GLIB flags for LE related functions
We were making use of USE_QCMAP which was not defined in configure files. Change-Id: I12f823a79b0036502b832a3fb40a93828bde6f59 CRs-Fixed: 2521803
Diffstat (limited to 'core')
-rw-r--r--core/SystemStatusOsObserver.cpp2
-rw-r--r--core/SystemStatusOsObserver.h8
-rw-r--r--core/observer/IFrameworkActionReq.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/core/SystemStatusOsObserver.cpp b/core/SystemStatusOsObserver.cpp
index 3fdb513..0427380 100644
--- a/core/SystemStatusOsObserver.cpp
+++ b/core/SystemStatusOsObserver.cpp
@@ -448,7 +448,7 @@ void SystemStatusOsObserver::turnOff(DataItemId dit)
}
}
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
bool SystemStatusOsObserver::connectBackhaul()
{
bool result = false;
diff --git a/core/SystemStatusOsObserver.h b/core/SystemStatusOsObserver.h
index 8710976..fd60606 100644
--- a/core/SystemStatusOsObserver.h
+++ b/core/SystemStatusOsObserver.h
@@ -84,7 +84,7 @@ public:
mSystemStatus(systemstatus), mContext(msgTask, this),
mAddress("SystemStatusOsObserver"),
mClientToDataItems(MAX_DATA_ITEM_ID), mDataItemToClients(MAX_DATA_ITEM_ID)
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
, mBackHaulConnectReqCount(0)
#endif
{
@@ -106,7 +106,7 @@ public:
// To set the framework action request object
inline void setFrameworkActionReqObj(IFrameworkActionReq* frameworkActionReqObj) {
mContext.mFrameworkActionReqObj = frameworkActionReqObj;
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
if (mBackHaulConnectReqCount > 0) {
connectBackhaul();
mBackHaulConnectReqCount = 0;
@@ -134,7 +134,7 @@ public:
// IFrameworkActionReq Overrides
virtual void turnOn(DataItemId dit, int timeOut = 0) override;
virtual void turnOff(DataItemId dit) override;
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
virtual bool connectBackhaul() override;
virtual bool disconnectBackhaul();
#endif
@@ -151,7 +151,7 @@ private:
// Cache the subscribe and requestData till subscription obj is obtained
void cacheObserverRequest(ObserverReqCache& reqCache,
const list<DataItemId>& l, IDataItemObserver* client);
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
// Cache the framework action request for connect/disconnect
int mBackHaulConnectReqCount;
#endif
diff --git a/core/observer/IFrameworkActionReq.h b/core/observer/IFrameworkActionReq.h
index a4ccad8..4be947f 100644
--- a/core/observer/IFrameworkActionReq.h
+++ b/core/observer/IFrameworkActionReq.h
@@ -70,7 +70,7 @@ public:
*/
virtual void turnOff (DataItemId dit) = 0;
-#ifdef USE_QCMAP
+#ifdef USE_GLIB
/**
* @brief Setup WWAN backhaul
* @details Setup WWAN backhaul