Pass Framework Action request object to HandleTurnOn msg task
Currently Sys Status OS Observer object was being passed, due to which actual turn on functionality in Framework action request object was not being invoked. Implement equals for SystemStatus class for BT scan device data so that it is handled correctly in setIteminReport. Change-Id: Ie7f24a1eaf886a2402698489bfd1d0ddc34585cf CRs-Fixed: 2321041
This commit is contained in:
parent
e183c75151
commit
352ffcb3c5
2 changed files with 14 additions and 5 deletions
|
@ -713,8 +713,12 @@ public:
|
||||||
BtDeviceScanDetailsDataItemBase() {}
|
BtDeviceScanDetailsDataItemBase() {}
|
||||||
inline SystemStatusBtDeviceScanDetail(const BtDeviceScanDetailsDataItemBase& itemBase) :
|
inline SystemStatusBtDeviceScanDetail(const BtDeviceScanDetailsDataItemBase& itemBase) :
|
||||||
BtDeviceScanDetailsDataItemBase(itemBase) {}
|
BtDeviceScanDetailsDataItemBase(itemBase) {}
|
||||||
inline bool equals(const SystemStatusBtDeviceScanDetail& /*peer*/) {
|
inline bool equals(const SystemStatusBtDeviceScanDetail& peer) {
|
||||||
return true;
|
return ((mApSrnRssi == peer.mApSrnRssi) &&
|
||||||
|
(0 == memcmp(mApSrnMacAddress, peer.mApSrnMacAddress, sizeof(mApSrnMacAddress))) &&
|
||||||
|
(mApSrnTimestamp == peer.mApSrnTimestamp) &&
|
||||||
|
(mRequestTimestamp == peer.mRequestTimestamp) &&
|
||||||
|
(mReceiveTimestamp == peer.mReceiveTimestamp));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -726,8 +730,12 @@ public:
|
||||||
BtLeDeviceScanDetailsDataItemBase() {}
|
BtLeDeviceScanDetailsDataItemBase() {}
|
||||||
inline SystemStatusBtleDeviceScanDetail(const BtLeDeviceScanDetailsDataItemBase& itemBase) :
|
inline SystemStatusBtleDeviceScanDetail(const BtLeDeviceScanDetailsDataItemBase& itemBase) :
|
||||||
BtLeDeviceScanDetailsDataItemBase(itemBase) {}
|
BtLeDeviceScanDetailsDataItemBase(itemBase) {}
|
||||||
inline bool equals(const SystemStatusBtleDeviceScanDetail& /*peer*/) {
|
inline bool equals(const SystemStatusBtleDeviceScanDetail& peer) {
|
||||||
return true;
|
return ((mApSrnRssi == peer.mApSrnRssi) &&
|
||||||
|
(0 == memcmp(mApSrnMacAddress, peer.mApSrnMacAddress, sizeof(mApSrnMacAddress))) &&
|
||||||
|
(mApSrnTimestamp == peer.mApSrnTimestamp) &&
|
||||||
|
(mRequestTimestamp == peer.mRequestTimestamp) &&
|
||||||
|
(mReceiveTimestamp == peer.mReceiveTimestamp));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -405,7 +405,8 @@ void SystemStatusOsObserver::turnOn(DataItemId dit, int timeOut)
|
||||||
DataItemId mDataItemId;
|
DataItemId mDataItemId;
|
||||||
int mTimeOut;
|
int mTimeOut;
|
||||||
};
|
};
|
||||||
mContext.mMsgTask->sendMsg(new (nothrow) HandleTurnOnMsg(this, dit, timeOut));
|
mContext.mMsgTask->sendMsg(
|
||||||
|
new (nothrow) HandleTurnOnMsg(mContext.mFrameworkActionReqObj, dit, timeOut));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Found in map, update reference count
|
// Found in map, update reference count
|
||||||
|
|
Loading…
Reference in a new issue