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

Commit 4774b079 authored Apr 22, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Apr 22, 2022

Merge "Fix use-after-free in GnssMesaurementInterface" into tm-dev am:...

Merge "Fix use-after-free in GnssMesaurementInterface" into tm-dev am: c495886f am: 2654bde5 am: cd477915

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

Change-Id: I455ba46dc1aafb2cf001f4c8cffc425ae296f4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c435881a cd477915

gnss/aidl/default/Gnss.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@ 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

+3 −1

Original line number	Diff line number	Diff line
		@@ -106,12 +106,14 @@ 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

+3 −1

Original line number	Diff line number	Diff line
		@@ -69,12 +69,14 @@ 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) {