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

Commit b3b80362 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix use-after-free in GnssMesaurementInterface"" into tm-dev am: 9a7e1937 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17908714



Change-Id: Icac47d22c0a00ce027e6d1fc58235c6c622f5500
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8412cc32 9a7e1937

gnss/aidl/default/Gnss.cpp

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ void Gnss::reportSvStatus(const std::vector<GnssSvInfo>& svInfoList) const { 


std::vector<GnssSvInfo> Gnss::filterBlocklistedSatellites(

        std::vector<GnssSvInfo> gnssSvInfoList) const {

    ALOGD("filterBlocklistedSatellites");

    for (uint32_t i = 0; i < gnssSvInfoList.size(); i++) {

        if (mGnssConfiguration->isBlocklisted(gnssSvInfoList[i])) {

            gnssSvInfoList[i].svFlag &= ~(uint32_t)IGnssCallback::GnssSvFlags::USED_IN_FIX;

gnss/aidl/default/GnssMeasurementInterface.cpp

+1 −3
Original line number Diff line number Diff line
@@ -106,14 +106,12 @@ void GnssMeasurementInterface::start(const bool enableCorrVecOutputs) { 
            std::this_thread::sleep_for(std::chrono::milliseconds(mMinIntervalMillis));

        }

    });

    mThread.detach();

}



void GnssMeasurementInterface::stop() {

    ALOGD("stop");

    mIsActive = false;

    if (mThread.joinable()) {

        mThread.join();

    }

}



void GnssMeasurementInterface::reportMeasurement(const GnssData& data) {

gnss/aidl/default/GnssNavigationMessageInterface.cpp

+1 −3
Original line number Diff line number Diff line
@@ -69,14 +69,12 @@ void GnssNavigationMessageInterface::start() { 
            std::this_thread::sleep_for(std::chrono::milliseconds(mMinIntervalMillis));

        }

    });

    mThread.detach();

}



void GnssNavigationMessageInterface::stop() {

    ALOGD("stop");

    mIsActive = false;

    if (mThread.joinable()) {

        mThread.join();

    }

}



void GnssNavigationMessageInterface::reportMessage(const GnssNavigationMessage& message) {