commit 160e4a1dee6e4aca54190c057884d0ddf869d2ef
author Sam Dubey <dubeyshubham@google.com> Fri Apr 22 13:35:08 2022 +0000
committer Sam Dubey <dubeyshubham@google.com> Fri Apr 22 13:35:08 2022 +0000
tree ce930b66c536a7e2306741f739be27b568e54cbf
parent b6686e725a5a06757d66898562f20d5ea04ea9b3

Revert "Fix use-after-free in GnssMesaurementInterface"

This reverts commit b6686e725a5a06757d66898562f20d5ea04ea9b3.

Reason for revert: Broke LocationManagerFineTest

Bug: 230085457
Change-Id: Ic699cf1583dd9b858cb5dcd2545ca448a17def6e

gnss/aidl/default/Gnss.cpp

diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp
index 226b1f4..7855b51 100644
--- a/gnss/aidl/default/Gnss.cpp
+++ b/gnss/aidl/default/Gnss.cpp
@@ -153,6 +153,7 @@
 
 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

diff --git a/gnss/aidl/default/GnssMeasurementInterface.cpp b/gnss/aidl/default/GnssMeasurementInterface.cpp
index 228d5bf..2c7241b 100644
--- a/gnss/aidl/default/GnssMeasurementInterface.cpp
+++ b/gnss/aidl/default/GnssMeasurementInterface.cpp
@@ -106,14 +106,12 @@
             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

diff --git a/gnss/aidl/default/GnssNavigationMessageInterface.cpp b/gnss/aidl/default/GnssNavigationMessageInterface.cpp
index fe34787..4bc859d 100644
--- a/gnss/aidl/default/GnssNavigationMessageInterface.cpp
+++ b/gnss/aidl/default/GnssNavigationMessageInterface.cpp
@@ -69,14 +69,12 @@
             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) {