diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2017-01-08 11:10:08 +0000 |
|---|---|---|
| committer | davidevinavil <davidevinavil@gmail.com> | 2017-01-21 18:29:42 +0100 |
| commit | b157b3b3c110e58cf78f51f06b36f8ce98b24e3c (patch) | |
| tree | ea045134e95ef1c193f1995f55378380134645d8 | |
| parent | 4bfff05a88cb2baca116cd03a27b6bc8937e07f7 (diff) | |
z2_plus: Update GPS and Location API from upstream
* Tag: LA.UM.5.5.r1-02300-8x96.0
Change-Id: I0449ca62f7ad8763c799e865be39b5146e0b0e31
| -rw-r--r-- | gps/etc/gps.conf | 3 | ||||
| -rw-r--r-- | gps/loc_api/loc_api_v02/LocApiV02.cpp | 6 | ||||
| -rw-r--r-- | gps/utils/MsgTask.cpp | 4 |
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 { |