commit 1c2eaeae770663dec5b7a81d0585cf6f3af6d733
author Yuchen He <yuchenhe@google.com> Mon Aug 23 16:40:24 2021 +0000
committer Bo Hu <bohu@google.com> Thu Aug 26 16:45:13 2021 +0000
tree 2eea2fcd6460d9ea208b6e10545bcb338c4336b8
parent 172456e939a62d49b172afb25c4dd926cb6db9d6

Report default location when location is not available in /dev/gnss0

Test: atest VtsHalGnssTargetTest
Bug: 197579774
Bug: 197825053
Change-Id: I08e761d6023df2954d8a265b4af3e5b5d0aec09c
(cherry picked from commit 1aac7fa45c69ef13f93f3f79f28c5c6424b22e99)

gnss/common/utils/default/include/v2_1/GnssTemplate.h

diff --git a/gnss/common/utils/default/include/v2_1/GnssTemplate.h b/gnss/common/utils/default/include/v2_1/GnssTemplate.h
index 131af24..48cab99 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 @@
             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();