MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "XTRA Client 2.0"

Browse source
This commit is contained in:
Linux Build Service Account 2016-04-29 15:19:56 -07:00 committed by Gerrit - the friendly Code Review server
commit 7bf29855bf
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
etc/gps.conf
View file

@ -16,14 +16,8 @@ XTRA_VERSION_CHECK=0
# _CLEAR = 0 # _CLEAR = 0
ERR_ESTIMATE=0 ERR_ESTIMATE=0
#Test #NTP server
NTP_SERVER=time.gpsonextra.net NTP_SERVER=time.izatcloud.net
#Asia
# NTP_SERVER=asia.pool.ntp.org
#Europe
# NTP_SERVER=europe.pool.ntp.org
#North America
# NTP_SERVER=north-america.pool.ntp.org
# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
# 4 - Debug, 5 - Verbose # 4 - Debug, 5 - Verbose

3
loc_api/libloc_api_50001/loc.cpp
View file

@ -541,7 +541,10 @@ SIDE EFFECTS
static void loc_delete_aiding_data(GpsAidingData f) static void loc_delete_aiding_data(GpsAidingData f)
{ {
ENTRY_LOG(); ENTRY_LOG();
#ifndef TARGET_BUILD_VARIANT_USER
loc_eng_delete_aiding_data(loc_afw_data, f); loc_eng_delete_aiding_data(loc_afw_data, f);
#endif
EXIT_LOG(%s, VOID_RET); EXIT_LOG(%s, VOID_RET);
} }

6
utils/log_util.h
View file

@ -159,6 +159,12 @@ else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGV("V/" __VA_ARGS__); }
} \ } \
} while(0) } while(0)
#define LOC_LOG_HEAD(tag,fmt) "%s:%d][" tag "] " fmt "\n"
#define LOC_LOGv(tag,fmt,...) LOC_LOGV(LOC_LOG_HEAD(tag,fmt), __func__, __LINE__, ##__VA_ARGS__)
#define LOC_LOGw(tag,fmt,...) LOC_LOGW(LOC_LOG_HEAD(tag,fmt), __func__, __LINE__, ##__VA_ARGS__)
#define LOC_LOGd(tag,fmt,...) LOC_LOGD(LOC_LOG_HEAD(tag,fmt), __func__, __LINE__, ##__VA_ARGS__)
#define LOC_LOGe(tag,fmt,...) LOC_LOGE(LOC_LOG_HEAD(tag,fmt), __func__, __LINE__, ##__VA_ARGS__)
#define LOG_I(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGI, ID, WHAT, SPEC, VAL) #define LOG_I(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGI, ID, WHAT, SPEC, VAL)
#define LOG_V(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGV, ID, WHAT, SPEC, VAL) #define LOG_V(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGV, ID, WHAT, SPEC, VAL)
#define LOG_E(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGE, ID, WHAT, SPEC, VAL) #define LOG_E(ID, WHAT, SPEC, VAL) LOG_(LOC_LOGE, ID, WHAT, SPEC, VAL)