diff options
author | qctecmdr Service <qctecmdr@qualcomm.com> | 2019-01-22 11:12:28 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-22 11:12:28 -0800 |
commit | 955f05e8e79829498422ae2958e0eb0406a13409 (patch) | |
tree | 67ef6faa30360779463b716ac1adef66007d564f /utils | |
parent | 8e9a6eacc6a6c4f85a5e524e26290cb9681fc377 (diff) | |
parent | afcf4af54e4dd7d0b19471ea42b24a6713ed9043 (diff) | |
download | gps-955f05e8e79829498422ae2958e0eb0406a13409.tar.gz |
Merge "make location.lnx.5.0 build for LE"
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Android.mk | 3 | ||||
-rw-r--r-- | utils/loc_cfg.cpp | 15 | ||||
-rw-r--r-- | utils/loc_cfg.h | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/utils/Android.mk b/utils/Android.mk index d031d42..b8320de 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -11,8 +11,7 @@ include $(CLEAR_VARS) LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ - liblog \ - libqti_vndfwk_detect + liblog LOCAL_SRC_FILES += \ loc_log.cpp \ 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; diff --git a/utils/loc_cfg.h b/utils/loc_cfg.h index c8c39c9..5c77dc6 100644 --- a/utils/loc_cfg.h +++ b/utils/loc_cfg.h @@ -113,6 +113,8 @@ extern "C" { * MODULE EXPORTED FUNCTIONS * *============================================================================*/ +bool isVendorEnhanced(); +void setVendorEnhanced(bool vendorEnhanced); void loc_read_conf(const char* conf_file_name, const loc_param_s_type* config_table, uint32_t table_length); |