From a662140c68b9909d03b419b6aa1ebc822bc59e0f Mon Sep 17 00:00:00 2001 From: Yuchen He Date: Mon, 11 Oct 2021 21:15:20 +0000 Subject: [PATCH] Merge fix to AOSP: Report default location when location is not available in /dev/gnss0 Change-Id: I3ce672aa1a7a39c256dd1396658859c205b61399 Test: atest VtsHalGnssTargetTest Bug: 197579774 --- gnss/common/utils/default/include/v2_1/GnssTemplate.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnss/common/utils/default/include/v2_1/GnssTemplate.h b/gnss/common/utils/default/include/v2_1/GnssTemplate.h index 131af24fbe..48cab99a10 100644 --- a/gnss/common/utils/default/include/v2_1/GnssTemplate.h +++ b/gnss/common/utils/default/include/v2_1/GnssTemplate.h @@ -223,14 +223,8 @@ Return GnssTemplate::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();