From 5f33dbe46c9bf323837ba8c55facbd688b2c4e3f Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 14 Dec 2021 12:06:02 +0800 Subject: Add IAGnssRil AIDL HAL (hardware/interfaces) Bug: 205185251 Bug: 182975915 Test: atest VtsHalGnssTargetTest Change-Id: Ie5746ae25db3beff20f1311f4ddaa592d8ca934b --- gnss/aidl/default/Gnss.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index e296351d95..dba54a017d 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -20,6 +20,7 @@ #include #include #include "AGnss.h" +#include "AGnssRil.h" #include "GnssBatching.h" #include "GnssConfiguration.h" #include "GnssDebug.h" @@ -154,7 +155,7 @@ ScopedAStatus Gnss::close() { return ScopedAStatus::ok(); } -ndk::ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr* iAGnss) { +ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr* iAGnss) { ALOGD("Gnss::getExtensionAGnss"); *iAGnss = SharedRefBase::make(); return ndk::ScopedAStatus::ok(); @@ -166,6 +167,12 @@ ScopedAStatus Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs, int unce return ScopedAStatus::ok(); } +ScopedAStatus Gnss::getExtensionAGnssRil(std::shared_ptr* iAGnssRil) { + ALOGD("Gnss::getExtensionAGnssRil"); + *iAGnssRil = SharedRefBase::make(); + return ndk::ScopedAStatus::ok(); +} + ScopedAStatus Gnss::injectLocation(const GnssLocation& location) { ALOGD("injectLocation. lat:%lf, lng:%lf, acc:%f", location.latitudeDegrees, location.longitudeDegrees, location.horizontalAccuracyMeters); -- cgit v1.2.3 From dd7f7b9a9b8ed020e49a329ff2025da713b878e3 Mon Sep 17 00:00:00 2001 From: Shubham Dubey Date: Tue, 11 Jan 2022 05:26:13 +0000 Subject: Revert "Add IAGnssRil AIDL HAL (hardware/interfaces)" Revert "Add AGnssRil AIDL HAL (frameworks/base)" Revert submission 16548632-IAGnssRil-AIDL Reason for revert: Breaking Build BUGID: b/213964109 Reverted Changes: I087f7c9ae:Add AGnssRil AIDL HAL (frameworks/base) Ie5746ae25:Add IAGnssRil AIDL HAL (hardware/interfaces) Change-Id: I2404199e0b881a18429cc2a4ebc87bb41e5be655 --- gnss/aidl/default/Gnss.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index dba54a017d..e296351d95 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -20,7 +20,6 @@ #include #include #include "AGnss.h" -#include "AGnssRil.h" #include "GnssBatching.h" #include "GnssConfiguration.h" #include "GnssDebug.h" @@ -155,7 +154,7 @@ ScopedAStatus Gnss::close() { return ScopedAStatus::ok(); } -ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr* iAGnss) { +ndk::ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr* iAGnss) { ALOGD("Gnss::getExtensionAGnss"); *iAGnss = SharedRefBase::make(); return ndk::ScopedAStatus::ok(); @@ -167,12 +166,6 @@ ScopedAStatus Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs, int unce return ScopedAStatus::ok(); } -ScopedAStatus Gnss::getExtensionAGnssRil(std::shared_ptr* iAGnssRil) { - ALOGD("Gnss::getExtensionAGnssRil"); - *iAGnssRil = SharedRefBase::make(); - return ndk::ScopedAStatus::ok(); -} - ScopedAStatus Gnss::injectLocation(const GnssLocation& location) { ALOGD("injectLocation. lat:%lf, lng:%lf, acc:%f", location.latitudeDegrees, location.longitudeDegrees, location.horizontalAccuracyMeters); -- cgit v1.2.3 From 42b2d0a65f4ba512004cf86c1e8ebd8898cd423d Mon Sep 17 00:00:00 2001 From: Yuchen He Date: Wed, 12 Jan 2022 04:39:37 +0000 Subject: Support the location injection in AIDL HAL Bug: 213225295 Test: atest VtsHalGnssTargetTest Change-Id: Iff9fca55722af9bad6cc50f0170e4e1a069d05d6 --- gnss/aidl/default/Gnss.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index e296351d95..657877898f 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -20,6 +20,7 @@ #include #include #include "AGnss.h" +#include "DeviceFileReader.h" #include "GnssBatching.h" #include "GnssConfiguration.h" #include "GnssDebug.h" @@ -28,10 +29,13 @@ #include "GnssNavigationMessageInterface.h" #include "GnssPsds.h" #include "GnssVisibilityControl.h" +#include "NmeaFixInfo.h" #include "Utils.h" namespace aidl::android::hardware::gnss { +using ::android::hardware::gnss::common::NmeaFixInfo; using ::android::hardware::gnss::common::Utils; + using ndk::ScopedAStatus; using GnssSvInfo = IGnssCallback::GnssSvInfo; @@ -62,6 +66,12 @@ ScopedAStatus Gnss::setCallback(const std::shared_ptr& callback) return ScopedAStatus::ok(); } +std::unique_ptr Gnss::getLocationFromHW() { + std::string inputStr = + ::android::hardware::gnss::common::DeviceFileReader::Instance().getLocationData(); + return ::android::hardware::gnss::common::NmeaFixInfo::getAidlLocationFromInputStr(inputStr); +} + ScopedAStatus Gnss::start() { ALOGD("start()"); if (mIsActive) { @@ -82,9 +92,14 @@ ScopedAStatus Gnss::start() { auto svStatus = filterBlocklistedSatellites(Utils::getMockSvInfoList()); this->reportSvStatus(svStatus); + auto currentLocation = getLocationFromHW(); mGnssPowerIndication->notePowerConsumption(); - const auto location = Utils::getMockLocation(); - this->reportLocation(location); + if (currentLocation != nullptr) { + this->reportLocation(*currentLocation); + } else { + const auto location = Utils::getMockLocation(); + this->reportLocation(location); + } std::this_thread::sleep_for(std::chrono::milliseconds(mMinIntervalMs)); } }); -- cgit v1.2.3 From 37d77dded63f6f4d28a853e459e42939eb308328 Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Thu, 30 Dec 2021 13:14:29 +0800 Subject: Add IGnssAntennaInfo AIDL HAL Bug: 205185369 Test: atest VtsHalGnssTargetTest Change-Id: If269c61b408c2710a4fa224de4d684c99ac5732b --- gnss/aidl/default/Gnss.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index 657877898f..2c6df995f1 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -21,6 +21,7 @@ #include #include "AGnss.h" #include "DeviceFileReader.h" +#include "GnssAntennaInfo.h" #include "GnssBatching.h" #include "GnssConfiguration.h" #include "GnssDebug.h" @@ -56,7 +57,8 @@ ScopedAStatus Gnss::setCallback(const std::shared_ptr& callback) int capabilities = (int)(IGnssCallback::CAPABILITY_SATELLITE_BLOCKLIST | IGnssCallback::CAPABILITY_SATELLITE_PVT | - IGnssCallback::CAPABILITY_CORRELATION_VECTOR); + IGnssCallback::CAPABILITY_CORRELATION_VECTOR | + IGnssCallback::CAPABILITY_ANTENNA_INFO); auto status = sGnssCallback->gnssSetCapabilitiesCb(capabilities); if (!status.isOk()) { @@ -279,4 +281,12 @@ ndk::ScopedAStatus Gnss::getExtensionGnssVisibilityControl( return ndk::ScopedAStatus::ok(); } +ndk::ScopedAStatus Gnss::getExtensionGnssAntennaInfo( + std::shared_ptr* iGnssAntennaInfo) { + ALOGD("Gnss::getExtensionGnssAntennaInfo"); + + *iGnssAntennaInfo = SharedRefBase::make(); + return ndk::ScopedAStatus::ok(); +} + } // namespace aidl::android::hardware::gnss -- cgit v1.2.3 From bbf7fb9322e495608b3d38f69e50081030669092 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Mon, 27 Dec 2021 12:13:02 +0800 Subject: Add MeasurementCorrections AIDL HAL (hardware/interfaces) Bug: 208728105 Test: atest VtsHalGnssTargetTest Change-Id: I2192670951a517bd229535a083997cc9bab31287 --- gnss/aidl/default/Gnss.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index 2c6df995f1..033088506b 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -30,6 +30,7 @@ #include "GnssNavigationMessageInterface.h" #include "GnssPsds.h" #include "GnssVisibilityControl.h" +#include "MeasurementCorrectionsInterface.h" #include "NmeaFixInfo.h" #include "Utils.h" @@ -289,4 +290,14 @@ ndk::ScopedAStatus Gnss::getExtensionGnssAntennaInfo( return ndk::ScopedAStatus::ok(); } +ndk::ScopedAStatus Gnss::getExtensionMeasurementCorrections( + std::shared_ptr* + iMeasurementCorrections) { + ALOGD("Gnss::getExtensionMeasurementCorrections"); + + *iMeasurementCorrections = + SharedRefBase::make(); + return ndk::ScopedAStatus::ok(); +} + } // namespace aidl::android::hardware::gnss -- cgit v1.2.3 From ad5d0702b7f4f010ae29be91362444e0ec55a85f Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Wed, 19 Jan 2022 19:01:44 +0800 Subject: Remove GnssAntennaInfo AIDL capability Since JNI is not ready yet, remove it to avoid cts fail. Bug: 215281989 Test: atest LocationManagerFineTest Change-Id: I69ced31e1de54ef9a325ba20020f1913fe3daddd --- gnss/aidl/default/Gnss.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnss/aidl/default/Gnss.cpp') diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp index 2c6df995f1..797570b1e2 100644 --- a/gnss/aidl/default/Gnss.cpp +++ b/gnss/aidl/default/Gnss.cpp @@ -57,8 +57,7 @@ ScopedAStatus Gnss::setCallback(const std::shared_ptr& callback) int capabilities = (int)(IGnssCallback::CAPABILITY_SATELLITE_BLOCKLIST | IGnssCallback::CAPABILITY_SATELLITE_PVT | - IGnssCallback::CAPABILITY_CORRELATION_VECTOR | - IGnssCallback::CAPABILITY_ANTENNA_INFO); + IGnssCallback::CAPABILITY_CORRELATION_VECTOR); auto status = sGnssCallback->gnssSetCapabilitiesCb(capabilities); if (!status.isOk()) { -- cgit v1.2.3