diff options
author | Dante Russo <drusso@codeaurora.org> | 2018-03-16 11:50:05 -0700 |
---|---|---|
committer | Dante Russo <drusso@codeaurora.org> | 2018-03-16 11:55:59 -0700 |
commit | 47d2e811e72e6fc0f3c799f3c884092ca0a67f30 (patch) | |
tree | 008697220f13ee570f12ee4472bc63a5c3178bdf | |
parent | 97f3f3905a46515ab852681268fcac155840f8b8 (diff) | |
download | gps-47d2e811e72e6fc0f3c799f3c884092ca0a67f30.tar.gz |
flp.conf should be read from /vendor/etc/
flp.conf was being read from incorrect path,
which was causing GetBatchSize API to read
incorrect batch size
Change-Id: Ib95610e72157834fc731f35b67eb475dfe6af5a2
CRs-fixed: 2193052
Bug: 73251835
-rw-r--r-- | location/Android.mk | 3 | ||||
-rw-r--r-- | location/LocationAPIClientBase.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/location/Android.mk b/location/Android.mk index 6ac8e36..693a0cd 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -15,7 +15,8 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libgps.utils \ libdl \ - liblog + liblog \ + libloc_pla LOCAL_SRC_FILES += \ LocationAPI.cpp \ diff --git a/location/LocationAPIClientBase.cpp b/location/LocationAPIClientBase.cpp index 343743a..cc9c080 100644 --- a/location/LocationAPIClientBase.cpp +++ b/location/LocationAPIClientBase.cpp @@ -30,11 +30,11 @@ #define LOG_TAG "LocSvc_APIClientBase" #include <platform_lib_log_util.h> +#include <platform_lib_macros.h> #include <inttypes.h> #include <loc_cfg.h> #include "LocationAPIClientBase.h" -#define FLP_CONF_FILE "/etc/flp.conf" #define GEOFENCE_SESSION_ID 0xFFFFFFFF #define CONFIG_SESSION_ID 0xFFFFFFFF @@ -364,7 +364,7 @@ int32_t LocationAPIClientBase::locAPIGetBatchSize() { {"BATCH_SIZE", &mBatchSize, nullptr, 'n'}, }; - UTIL_READ_CONF(FLP_CONF_FILE, flp_conf_param_table); + UTIL_READ_CONF(LOC_PATH_FLP_CONF, flp_conf_param_table); if (mBatchSize < 0) { // set mBatchSize to 0 if we got an illegal value from config file mBatchSize = 0; |