aboutsummaryrefslogtreecommitdiff
path: root/gps
diff options
context:
space:
mode:
Diffstat (limited to 'gps')
-rw-r--r--gps/etc/gps.conf3
-rw-r--r--gps/loc_api/loc_api_v02/LocApiV02.cpp6
-rw-r--r--gps/utils/MsgTask.cpp4
3 files changed, 8 insertions, 5 deletions
diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf
index edd07c4..af37bf1 100644
--- a/gps/etc/gps.conf
+++ b/gps/etc/gps.conf
@@ -19,6 +19,9 @@ ERR_ESTIMATE=0
#NTP server
NTP_SERVER=time.izatcloud.net
+#XTRA CA path
+XTRA_CA_PATH=/system/etc/security/cacerts
+
# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
# 4 - Debug, 5 - Verbose
# If DEBUG_LEVEL is commented, Android's logging levels will be used
diff --git a/gps/loc_api/loc_api_v02/LocApiV02.cpp b/gps/loc_api/loc_api_v02/LocApiV02.cpp
index 70a29a8..f52a3a8 100644
--- a/gps/loc_api/loc_api_v02/LocApiV02.cpp
+++ b/gps/loc_api/loc_api_v02/LocApiV02.cpp
@@ -1285,9 +1285,9 @@ enum loc_api_adapter_err LocApiV02 :: setXtraData(
char* data, int length)
{
locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
- int total_parts;
- uint8_t part;
- uint16_t len_injected;
+ uint16_t total_parts;
+ uint16_t part;
+ uint32_t len_injected;
locClientReqUnionType req_union;
qmiLocInjectPredictedOrbitsDataReqMsgT_v02 inject_xtra;
diff --git a/gps/utils/MsgTask.cpp b/gps/utils/MsgTask.cpp
index 78a3fe0..42079d7 100644
--- a/gps/utils/MsgTask.cpp
+++ b/gps/utils/MsgTask.cpp
@@ -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 {