Merge fix to AOSP: Report default location when location is not available in /dev/gnss0

Change-Id: I3ce672aa1a7a39c256dd1396658859c205b61399
Test: atest VtsHalGnssTargetTest
Bug: 197579774
This commit is contained in:
Yuchen He
2021-10-11 21:15:20 +00:00
parent 0531c94771
commit a662140c68

View File

@@ -223,14 +223,8 @@ Return<bool> GnssTemplate<T_IGnss>::start() {
this->reportSvStatus(svStatus);
auto currentLocation = getLocationFromHW();
notePowerConsumption();
if (mGnssFd != -1) {
// Only report location if the return from hardware is valid
// note that we can not merge these two "if" together, if didn't
// get location from hardware, we shouldn't report location, not
// report the "default" one.
if (currentLocation != nullptr) {
this->reportLocation(*currentLocation);
}
if (currentLocation != nullptr) {
this->reportLocation(*currentLocation);
} else {
if (sGnssCallback_2_1 != nullptr || sGnssCallback_2_0 != nullptr) {
const auto location = Utils::getMockLocationV2_0();