diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-21 08:08:57 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-09-21 08:08:57 -0700 |
| commit | 3722e3c0e337a4b46ad3819ea5d68e9e1d725efe (patch) | |
| tree | ddda79c0d20dbbab5058372b6e129dc8b2e93103 /core/SystemStatusOsObserver.h | |
| parent | e0361a8c9a9b7f4e000966c8b78468aef8c18c95 (diff) | |
| parent | f4dc944333c54a5455d17b6bd7c02d2ededb6e4a (diff) | |
| download | gps-3722e3c0e337a4b46ad3819ea5d68e9e1d725efe.tar.gz | |
Merge f4dc944333c54a5455d17b6bd7c02d2ededb6e4a on remote branch
Change-Id: Ic73cbf452cf633a503848271c3904abbc14a90c8
Diffstat (limited to 'core/SystemStatusOsObserver.h')
| -rw-r--r-- | core/SystemStatusOsObserver.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |