Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a662140c authored by Yuchen He's avatar Yuchen He
Browse files

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

Change-Id: I3ce672aa1a7a39c256dd1396658859c205b61399
Test: atest VtsHalGnssTargetTest
Bug: 197579774
parent 0531c947

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

+2 −8
Original line number Diff line number Diff line
@@ -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);

                }

            } else {

                if (sGnssCallback_2_1 != nullptr || sGnssCallback_2_0 != nullptr) {

                    const auto location = Utils::getMockLocationV2_0();