From 704ec016f51e56109069157eabe9eedfcaf9fc10 Mon Sep 17 00:00:00 2001 From: Vijayakumar Badiger Date: Mon, 16 Sep 2019 16:15:40 -0700 Subject: [PATCH 1/8] Preliminary Android target definition for sdmshrike Change-Id: Iadfeb1601be2a847de9e2645df8e017816a0f5bf --- build/target_specific_features.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build/target_specific_features.mk b/build/target_specific_features.mk index 766402a3..6093f4a8 100644 --- a/build/target_specific_features.mk +++ b/build/target_specific_features.mk @@ -38,6 +38,7 @@ GNSS_HIDL_2_0_TARGET_LIST += qcs605 GNSS_HIDL_2_0_TARGET_LIST += sdm845 GNSS_HIDL_2_0_TARGET_LIST += sdm660 GNSS_HIDL_2_0_TARGET_LIST += msmnile +GNSS_HIDL_2_0_TARGET_LIST += sdmshrike GNSS_HIDL_2_0_TARGET_LIST += $(MSMSTEPPE) GNSS_HIDL_2_0_TARGET_LIST += $(TRINKET) GNSS_HIDL_2_0_TARGET_LIST += kona From 4d2c7279b56707b08eb67236f7a0e9c85fcbac47 Mon Sep 17 00:00:00 2001 From: Ashish Dhiman Date: Mon, 28 Jan 2019 12:48:11 +0530 Subject: [PATCH 2/8] Add API to read the device SOC ID. CRs-Fixed: 2385448 Change-Id: Ia154c908e610e2e475171d9a45822bae84210d5b --- utils/loc_target.cpp | 21 +++++++++++++++++++++ utils/loc_target.h | 1 + 2 files changed, 22 insertions(+) diff --git a/utils/loc_target.cpp b/utils/loc_target.cpp index f6fd728a..a286fe1f 100644 --- a/utils/loc_target.cpp +++ b/utils/loc_target.cpp @@ -208,3 +208,24 @@ detected: LOC_LOGW("HAL: %s returned %d", __FUNCTION__, gTarget); return gTarget; } + +int loc_read_device_soc_id() +{ + char buf[10] = {0}; + int soc_id = 0; + int fd = open("/sys/devices/soc0/soc_id", O_RDONLY); + if (fd >= 0) + { + if (read(fd, buf, sizeof(buf) - 1) == -1) + { + LOC_LOGI ("%s: unable to read soc_id", __FUNCTION__); + } + else + { + soc_id = atoi(buf); + LOC_LOGI ("%s: Soc ID :%d", __FUNCTION__, soc_id); + } + close(fd); + } + return soc_id; +} diff --git a/utils/loc_target.h b/utils/loc_target.h index 172b4752..6abee89b 100644 --- a/utils/loc_target.h +++ b/utils/loc_target.h @@ -54,6 +54,7 @@ void loc_get_platform_name(char *platform_name, int array_length); /*The character array passed to this function should have length of atleast PROPERTY_VALUE_MAX*/ void loc_get_auto_platform_name(char *platform_name, int array_length); +int loc_read_device_soc_id(); /* Please remember to update 'target_name' in loc_log.cpp, if do any changes to this enum. */ From d66fc2cdb471bdd02b2b3541f9eddff1b7d59928 Mon Sep 17 00:00:00 2001 From: Prashant Kumar Date: Fri, 20 Sep 2019 09:47:40 +0530 Subject: [PATCH 3/8] Reversing the Added API to read the device SOC ID Change-Id: I96bd498fdd9509a1d52063ec26732a99365415d5 CRs-Fixed: 2531660 --- utils/loc_target.cpp | 21 --------------------- utils/loc_target.h | 1 - 2 files changed, 22 deletions(-) diff --git a/utils/loc_target.cpp b/utils/loc_target.cpp index a286fe1f..f6fd728a 100644 --- a/utils/loc_target.cpp +++ b/utils/loc_target.cpp @@ -208,24 +208,3 @@ detected: LOC_LOGW("HAL: %s returned %d", __FUNCTION__, gTarget); return gTarget; } - -int loc_read_device_soc_id() -{ - char buf[10] = {0}; - int soc_id = 0; - int fd = open("/sys/devices/soc0/soc_id", O_RDONLY); - if (fd >= 0) - { - if (read(fd, buf, sizeof(buf) - 1) == -1) - { - LOC_LOGI ("%s: unable to read soc_id", __FUNCTION__); - } - else - { - soc_id = atoi(buf); - LOC_LOGI ("%s: Soc ID :%d", __FUNCTION__, soc_id); - } - close(fd); - } - return soc_id; -} diff --git a/utils/loc_target.h b/utils/loc_target.h index 6abee89b..172b4752 100644 --- a/utils/loc_target.h +++ b/utils/loc_target.h @@ -54,7 +54,6 @@ void loc_get_platform_name(char *platform_name, int array_length); /*The character array passed to this function should have length of atleast PROPERTY_VALUE_MAX*/ void loc_get_auto_platform_name(char *platform_name, int array_length); -int loc_read_device_soc_id(); /* Please remember to update 'target_name' in loc_log.cpp, if do any changes to this enum. */ From f07b76bdc24c318281e6dfef49340675b514d6be Mon Sep 17 00:00:00 2001 From: Saurabh Srivastava Date: Wed, 18 Sep 2019 14:38:41 +0530 Subject: [PATCH 4/8] Adding NAVIC in delete aiding data Adding NAVIC to the SV type mask while deleting aiding data Change-Id: I704595b60e061e83c8c08f69f770e4a78b3ae409 CRs-Fixed: 2529784 --- android/2.0/location_api/GnssAPIClient.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/2.0/location_api/GnssAPIClient.cpp b/android/2.0/location_api/GnssAPIClient.cpp index ffe90750..0d813f47 100644 --- a/android/2.0/location_api/GnssAPIClient.cpp +++ b/android/2.0/location_api/GnssAPIClient.cpp @@ -279,7 +279,8 @@ void GnssAPIClient::gnssDeleteAidingData(IGnss::GnssAidingData aidingDataFlags) GNSS_AIDING_DATA_SV_TYPE_GLONASS_BIT | GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT | GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT | - GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT; + GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT | + GNSS_AIDING_DATA_SV_TYPE_NAVIC_BIT; if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL) data.deleteAll = true; From b6f19637e37de64478b743bbd8bea5955900190a Mon Sep 17 00:00:00 2001 From: Bhavna Sharma Date: Mon, 23 Sep 2019 10:08:23 -0700 Subject: [PATCH 5/8] Fix deleteAll case for GNSS HIDL 2.0 For GNSS HIDL 2.0, delete command should explicitly specify the engine the delete command is to be performed on. CRs-Fixed: 2533225 Change-Id: Ib69c3f11eb4df94a3becdbb2b0cff9288283067e --- android/2.0/location_api/GnssAPIClient.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/android/2.0/location_api/GnssAPIClient.cpp b/android/2.0/location_api/GnssAPIClient.cpp index 0d813f47..a3cdd278 100644 --- a/android/2.0/location_api/GnssAPIClient.cpp +++ b/android/2.0/location_api/GnssAPIClient.cpp @@ -281,6 +281,7 @@ void GnssAPIClient::gnssDeleteAidingData(IGnss::GnssAidingData aidingDataFlags) GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT | GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT | GNSS_AIDING_DATA_SV_TYPE_NAVIC_BIT; + data.posEngineMask = STANDARD_POSITIONING_ENGINE; if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL) data.deleteAll = true; From bf12ff26d542acd9e72344037cdcac5d301f1ade Mon Sep 17 00:00:00 2001 From: Harikrishnan Hariharan Date: Mon, 23 Sep 2019 15:49:43 +0530 Subject: [PATCH 6/8] Use 'subdir-objects' option in HAL configure options If a source file is in a subdirectory, but the 'subdir-objects' automake option hasn't been enabled. For now, the corresponding output object file(s) will be placed in the top-level directory. However, this behaviour will change in future Automake versions, they will unconditionally cause object files to be placed in the same subdirectory of the corresponding sources. So to avoid future incompatibilities, enable the 'subdir-objects' option in location module configure options. Change-Id: If9e94c0f6fcd9922ee7f0f9d1909d5d6579a5715 CRs-Fixed: 2533108 --- configure.ac | 2 +- core/configure.ac | 2 +- location/configure.ac | 2 +- utils/configure.ac | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0ab8e68e..2a44051b 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.61) # Initialize the gps loc-hal package version 1.0.0 AC_INIT([loc-hal],1.0.0) # Does not strictly follow GNU Coding standards -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) # Disables auto rebuilding of configure, Makefile.ins AM_MAINTAINER_MODE # Verifies the --srcdir is correct by checking for the path diff --git a/core/configure.ac b/core/configure.ac index ea0a128d..c3e062b6 100644 --- a/core/configure.ac +++ b/core/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.61) # Initialize the gps loc-hal package version 1.0.0 AC_INIT([loc-core],1.0.0) # Does not strictly follow GNU Coding standards -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) # Disables auto rebuilding of configure, Makefile.ins AM_MAINTAINER_MODE # Verifies the --srcdir is correct by checking for the path diff --git a/location/configure.ac b/location/configure.ac index 6391d65d..39abb69f 100644 --- a/location/configure.ac +++ b/location/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.61) # Initialize the gps location-api-iface package version 1.0.0 AC_INIT([location-api-iface],1.0.0) # Does not strictly follow GNU Coding standards -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) # Disables auto rebuilding of configure, Makefile.ins AM_MAINTAINER_MODE # Verifies the --srcdir is correct by checking for the path diff --git a/utils/configure.ac b/utils/configure.ac index fd164943..2a04f450 100644 --- a/utils/configure.ac +++ b/utils/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.61) # Initialize the gps gps-utils package version 1.0.0 AC_INIT([gps-utils],1.0.0) # Does not strictly follow GNU Coding standards -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) # Disables auto rebuilding of configure, Makefile.ins AM_MAINTAINER_MODE # Verifies the --srcdir is correct by checking for the path From 2ef1adca4524dd44d92dcd002575ce1bec87ec71 Mon Sep 17 00:00:00 2001 From: Mike Cailean Date: Tue, 1 Oct 2019 11:50:44 -0700 Subject: [PATCH 7/8] Systemstatus - add support older version of PQWME Add support of older (shorter) version of PQWME strings from modem. Systemstatus currently discards those shorter strings. This change is to fill out all zeros in those missing fields instead of discarding the whole sentence. Change-Id: I0276e595c738253608071f12170232a59e3b2e9e CRs-Fixed: 2153513 --- core/SystemStatus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/SystemStatus.cpp b/core/SystemStatus.cpp index 7d766517..0624580b 100644 --- a/core/SystemStatus.cpp +++ b/core/SystemStatus.cpp @@ -158,6 +158,7 @@ private: eAgcGlo = 20, eAgcBds = 21, eAgcGal = 22, + eMax0 = eAgcGal, eLeapSeconds = 23, eLeapSecUnc = 24, eGloBpAmpI = 25, @@ -166,7 +167,6 @@ private: eBdsBpAmpQ = 28, eGalBpAmpI = 29, eGalBpAmpQ = 30, - eMax0 = eGalBpAmpQ, eTimeUncNs = 31, eMax }; From 2f8791ecd433f5335d56a4a03ac35c3d95a2b90c Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Tue, 1 Oct 2019 16:37:20 -0700 Subject: [PATCH 8/8] Update SSL cert path Update to use SSL1.1 certificate path CRs-Fixed: 2538925 Change-Id: I00d2566e4d1cb793aaf6b539dea2d8160387f6ba --- etc/gps.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/gps.conf b/etc/gps.conf index fc376530..63547653 100644 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -14,7 +14,7 @@ ERR_ESTIMATE=0 NTP_SERVER=time.izatcloud.net #XTRA CA path -XTRA_CA_PATH=/usr/lib/ssl/certs +XTRA_CA_PATH=/usr/lib/ssl-1.1/certs # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose