sanders: gps: switch to LA.UM.6.6.r1-04300-89xx.0 branch
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* Copyright (c) 2011-2013,2015 The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2011-2013, 2015, 2017The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
@@ -26,7 +26,7 @@
|
||||
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
#define LOG_NDDEBUG 0
|
||||
#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "LocSvc_MsgTask"
|
||||
|
||||
#include <unistd.h>
|
||||
@@ -62,9 +62,9 @@ MsgTask::~MsgTask() {
|
||||
}
|
||||
|
||||
void MsgTask::destroy() {
|
||||
LocThread* thread = mThread;
|
||||
msg_q_unblock((void*)mQ);
|
||||
if (mThread) {
|
||||
LocThread* thread = mThread;
|
||||
if (thread) {
|
||||
mThread = NULL;
|
||||
delete thread;
|
||||
} else {
|
||||
@@ -73,7 +73,11 @@ void MsgTask::destroy() {
|
||||
}
|
||||
|
||||
void MsgTask::sendMsg(const LocMsg* msg) const {
|
||||
msg_q_snd((void*)mQ, (void*)msg, LocMsgDestroy);
|
||||
if (msg) {
|
||||
msg_q_snd((void*)mQ, (void*)msg, LocMsgDestroy);
|
||||
} else {
|
||||
LOC_LOGE("%s: msg is NULL", __func__);
|
||||
}
|
||||
}
|
||||
|
||||
void MsgTask::prerun() {
|
||||
@@ -82,7 +86,6 @@ void MsgTask::prerun() {
|
||||
}
|
||||
|
||||
bool MsgTask::run() {
|
||||
LOC_LOGV("MsgTask::loop() listening ...\n");
|
||||
LocMsg* msg;
|
||||
msq_q_err_type result = msg_q_rcv((void*)mQ, (void **)&msg);
|
||||
if (eMSG_Q_SUCCESS != result) {
|
||||
|
||||
Reference in New Issue
Block a user