MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make use of USE_GLIB flags for LE related functions

Browse source 
We were making use of USE_QCMAP which was not defined in
configure files.

Change-Id: I12f823a79b0036502b832a3fb40a93828bde6f59
CRs-Fixed: 2521803
This commit is contained in:
Harikrishnan Hariharan 2019-09-01 10:52:23 +05:30 committed by Gerrit - the friendly Code Review server
parent 1209591f94
commit f4dc944333
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/SystemStatusOsObserver.cpp
View file

@ -448,7 +448,7 @@ void SystemStatusOsObserver::turnOff(DataItemId dit)
} }
} }
#ifdef USE_QCMAP #ifdef USE_GLIB
bool SystemStatusOsObserver::connectBackhaul() bool SystemStatusOsObserver::connectBackhaul()
{ {
bool result = false; bool result = false;

8
core/SystemStatusOsObserver.h
View file

@ -84,7 +84,7 @@ public:
mSystemStatus(systemstatus), mContext(msgTask, this), mSystemStatus(systemstatus), mContext(msgTask, this),
mAddress("SystemStatusOsObserver"), mAddress("SystemStatusOsObserver"),
mClientToDataItems(MAX_DATA_ITEM_ID), mDataItemToClients(MAX_DATA_ITEM_ID) mClientToDataItems(MAX_DATA_ITEM_ID), mDataItemToClients(MAX_DATA_ITEM_ID)
#ifdef USE_QCMAP #ifdef USE_GLIB
, mBackHaulConnectReqCount(0) , mBackHaulConnectReqCount(0)
#endif #endif
{ {
@ -106,7 +106,7 @@ public:
// To set the framework action request object // To set the framework action request object
inline void setFrameworkActionReqObj(IFrameworkActionReq* frameworkActionReqObj) { inline void setFrameworkActionReqObj(IFrameworkActionReq* frameworkActionReqObj) {
mContext.mFrameworkActionReqObj = frameworkActionReqObj; mContext.mFrameworkActionReqObj = frameworkActionReqObj;
#ifdef USE_QCMAP #ifdef USE_GLIB
if (mBackHaulConnectReqCount > 0) { if (mBackHaulConnectReqCount > 0) {
connectBackhaul(); connectBackhaul();
mBackHaulConnectReqCount = 0; mBackHaulConnectReqCount = 0;
@ -134,7 +134,7 @@ public:
// IFrameworkActionReq Overrides // IFrameworkActionReq Overrides
virtual void turnOn(DataItemId dit, int timeOut = 0) override; virtual void turnOn(DataItemId dit, int timeOut = 0) override;
virtual void turnOff(DataItemId dit) override; virtual void turnOff(DataItemId dit) override;
#ifdef USE_QCMAP #ifdef USE_GLIB
virtual bool connectBackhaul() override; virtual bool connectBackhaul() override;
virtual bool disconnectBackhaul(); virtual bool disconnectBackhaul();
#endif #endif
@ -151,7 +151,7 @@ private:
// Cache the subscribe and requestData till subscription obj is obtained // Cache the subscribe and requestData till subscription obj is obtained
void cacheObserverRequest(ObserverReqCache& reqCache, void cacheObserverRequest(ObserverReqCache& reqCache,
const list<DataItemId>& l, IDataItemObserver* client); const list<DataItemId>& l, IDataItemObserver* client);
#ifdef USE_QCMAP #ifdef USE_GLIB
// Cache the framework action request for connect/disconnect // Cache the framework action request for connect/disconnect
int mBackHaulConnectReqCount; int mBackHaulConnectReqCount;
#endif #endif

2
core/observer/IFrameworkActionReq.h
View file

@ -70,7 +70,7 @@ public:
*/ */
virtual void turnOff (DataItemId dit) = 0; virtual void turnOff (DataItemId dit) = 0;
#ifdef USE_QCMAP #ifdef USE_GLIB
/** /**
* @brief Setup WWAN backhaul * @brief Setup WWAN backhaul
* @details Setup WWAN backhaul * @details Setup WWAN backhaul