sm6150-common: gps: Add NULL check before object access
Correct the NULL check code block and add NULL check before object access. Change-Id: Ic41b781b41fb4e21bbff8801d500a41a6d7219d0 CRs-fixed: 3084543
This commit is contained in:
parent
29be33dd64
commit
0c0ae20c68
@ -184,16 +184,19 @@ BatteryListenerImpl::~BatteryListenerImpl()
|
||||
{
|
||||
{
|
||||
std::lock_guard<std::mutex> _l(mLock);
|
||||
if (mHealth != NULL)
|
||||
if (mHealth != NULL) {
|
||||
mHealth->unregisterCallback(this);
|
||||
auto r = mHealth->unlinkToDeath(this);
|
||||
if (!r.isOk() || r == false) {
|
||||
LOC_LOGe("Transaction error in unregister to HealthHAL death: %s",
|
||||
r.description().c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
mDone = true;
|
||||
mThread->join();
|
||||
if (NULL != mThread) {
|
||||
mThread->join();
|
||||
}
|
||||
}
|
||||
|
||||
void BatteryListenerImpl::serviceDied(uint64_t cookie __unused,
|
||||
@ -210,7 +213,9 @@ void BatteryListenerImpl::serviceDied(uint64_t cookie __unused,
|
||||
}
|
||||
mHealth = NULL;
|
||||
mCond.notify_one();
|
||||
mThread->join();
|
||||
if (NULL != mThread) {
|
||||
mThread->join();
|
||||
}
|
||||
std::lock_guard<std::mutex> _l(mLock);
|
||||
init();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user