Antenna phase center fixes
1. Set capabilities for antenna corrections only if
the configuration file is present and the vector
size is non zero
2. Include configuration file in CRM
3. Include flp.conf in CRM
Change-Id: Ic88cfc14baa4563fef67242ad6ed3cadd2a756db
CRs-fixed: 2710886
diff --git a/android/2.1/location_api/GnssAPIClient.cpp b/android/2.1/location_api/GnssAPIClient.cpp
index 22fb6a9..cc4b572 100644
--- a/android/2.1/location_api/GnssAPIClient.cpp
+++ b/android/2.1/location_api/GnssAPIClient.cpp
@@ -394,7 +394,17 @@
if (gnssCbIface_2_1 != nullptr ||gnssCbIface_2_0 != nullptr || gnssCbIface != nullptr) {
- uint32_t data = (uint32_t) V2_1::IGnssCallback::Capabilities::ANTENNA_INFO;
+ uint32_t antennaInfoVectorSize = 0;
+ uint32_t data = 0;
+ loc_param_s_type ant_info_vector_table[] =
+ {
+ { "ANTENNA_INFO_VECTOR_SIZE", &antennaInfoVectorSize, NULL, 'n' }
+ };
+ UTIL_READ_CONF(LOC_PATH_ANT_CORR, ant_info_vector_table);
+
+ if (0 != antennaInfoVectorSize) {
+ data |= V2_1::IGnssCallback::Capabilities::ANTENNA_INFO;
+ }
if ((capabilitiesMask & LOCATION_CAPABILITIES_TIME_BASED_TRACKING_BIT) ||
(capabilitiesMask & LOCATION_CAPABILITIES_TIME_BASED_BATCHING_BIT) ||
diff --git a/gps_vendor_product.mk b/gps_vendor_product.mk
index ab11e96..46692bf 100644
--- a/gps_vendor_product.mk
+++ b/gps_vendor_product.mk
@@ -24,6 +24,8 @@
ifneq (,$(filter $(LOC_BOARD_PLATFORM_LIST),$(TARGET_BOARD_PLATFORM)))
PRODUCT_PACKAGES += gps.conf
+PRODUCT_PACKAGES += flp.conf
+PRODUCT_PACKAGES += gnss_antenna_info.conf
PRODUCT_PACKAGES += libloc_pla_headers
PRODUCT_PACKAGES += liblocation_api_headers
PRODUCT_PACKAGES += libgps.utils_headers
