diff options
| author | Kevin Tang <zhikait@codeaurora.org> | 2019-01-15 22:23:55 -0800 |
|---|---|---|
| committer | Kevin Tang <zhikait@codeaurora.org> | 2019-01-17 14:19:04 -0800 |
| commit | afcf4af54e4dd7d0b19471ea42b24a6713ed9043 (patch) | |
| tree | 67c90922740face81fc024bdba80a596c650a8ae /utils/loc_cfg.cpp | |
| parent | 400c1e8b5748ae2ad360aa558ad3552ce4e0227c (diff) | |
| download | gps-afcf4af54e4dd7d0b19471ea42b24a6713ed9043.tar.gz | |
make location.lnx.5.0 build for LE
Change-Id: Ia8c39902ae7ce532d5efa9f36058a8f3f0e0b674
CRs-Fixed: 2381679
Diffstat (limited to 'utils/loc_cfg.cpp')
| -rw-r--r-- | utils/loc_cfg.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp index 36bd80a..4ab68f0 100644 --- a/utils/loc_cfg.cpp +++ b/utils/loc_cfg.cpp @@ -48,10 +48,6 @@ #endif #include "log_util.h" -extern "C" { -#include "vndfwk-detect.h" -} - /*============================================================================= * * GLOBAL DATA DECLARATION @@ -62,6 +58,7 @@ extern "C" { static uint32_t DEBUG_LEVEL = 0xff; static uint32_t TIMESTAMP = 0; static uint32_t DATUM_TYPE = 0; +static bool sVendorEnhanced = true; /* Parameter spec table */ static const loc_param_s_type loc_param_table[] = @@ -91,6 +88,13 @@ const char LOC_PATH_APDR_CONF[] = LOC_PATH_APDR_CONF_STR; const char LOC_PATH_XTWIFI_CONF[] = LOC_PATH_XTWIFI_CONF_STR; const char LOC_PATH_QUIPC_CONF[] = LOC_PATH_QUIPC_CONF_STR; +bool isVendorEnhanced() { + return sVendorEnhanced; +} +void setVendorEnhanced(bool vendorEnhanced) { + sVendorEnhanced = vendorEnhanced; +} + /*=========================================================================== FUNCTION loc_get_datum_type @@ -764,8 +768,7 @@ int loc_read_process_conf(const char* conf_file_name, uint32_t * process_count_p continue; } - if ((isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process == 0) || - (!isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process != 0)) { + if (isVendorEnhanced() != conf.vendor_enhanced_process != 0) { LOC_LOGD("%s:%d]: Process %s is disabled via vendor enhanced process check", __func__, __LINE__, conf.proc_name); child_proc[j].proc_status = DISABLED_VIA_VENDOR_ENHANCED_CHECK; |