diff options
| author | Madhanraj Chelladurai <mchellad@codeaurora.org> | 2018-09-07 14:32:15 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-17 11:27:39 -0700 |
| commit | 2ed4407e7c3e31801b55937008691a07908c4673 (patch) | |
| tree | dc756ce872b357203f36efaa2e24500c457ca580 /core | |
| parent | 4140f7235eb040601e7037891b7d26970b1e7535 (diff) | |
| download | gps-2ed4407e7c3e31801b55937008691a07908c4673.tar.gz | |
gps: use common compilation flag for the same functionality
modify the compilation flag to be in alignment with the location
services library
Change-Id: Ie65e6e803c50524c0913b1475edbf556a5b7f207
CRs-Fixed: 2299356
Diffstat (limited to 'core')
| -rw-r--r-- | core/SystemStatusOsObserver.cpp | 2 | ||||
| -rw-r--r-- | core/SystemStatusOsObserver.h | 8 | ||||
| -rw-r--r-- | core/observer/IFrameworkActionReq.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/SystemStatusOsObserver.cpp b/core/SystemStatusOsObserver.cpp index 8127e86..9c65aad 100644 --- a/core/SystemStatusOsObserver.cpp +++ b/core/SystemStatusOsObserver.cpp @@ -448,7 +448,7 @@ void SystemStatusOsObserver::turnOff(DataItemId dit) } } -#ifdef USE_GLIB +#ifdef USE_QCMAP bool SystemStatusOsObserver::connectBackhaul() { bool result = false; diff --git a/core/SystemStatusOsObserver.h b/core/SystemStatusOsObserver.h index fd60606..8710976 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_GLIB +#ifdef USE_QCMAP , 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_GLIB +#ifdef USE_QCMAP 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_GLIB +#ifdef USE_QCMAP 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_GLIB +#ifdef USE_QCMAP // Cache the framework action request for connect/disconnect int mBackHaulConnectReqCount; #endif diff --git a/core/observer/IFrameworkActionReq.h b/core/observer/IFrameworkActionReq.h index 4be947f..a4ccad8 100644 --- a/core/observer/IFrameworkActionReq.h +++ b/core/observer/IFrameworkActionReq.h @@ -70,7 +70,7 @@ public: */ virtual void turnOff (DataItemId dit) = 0; -#ifdef USE_GLIB +#ifdef USE_QCMAP /** * @brief Setup WWAN backhaul * @details Setup WWAN backhaul |