Fix deadlock in cuttlefish/default implementation
Bug: 150830099
Test: atest LocationManagerFineTest#testRegisterGnssMeasurementsCallback
-c --iterations 100
Change-Id: I70aec19a481781d924ed3008765ca624a7eeb950
Merged-In: I70aec19a481781d924ed3008765ca624a7eeb950
(cherry picked from commit 3d652709ed40f8070c990bb275d3709d603d318e)
diff --git a/gnss/2.1/default/GnssMeasurement.h b/gnss/2.1/default/GnssMeasurement.h
index 3ed7bc5..d446419 100644
--- a/gnss/2.1/default/GnssMeasurement.h
+++ b/gnss/2.1/default/GnssMeasurement.h
@@ -66,11 +66,17 @@
void reportMeasurement(const GnssDataV2_0&);
void reportMeasurement(const GnssDataV2_1&);
+ // Guarded by mMutex
static sp<V2_1::IGnssMeasurementCallback> sCallback_2_1;
+
+ // Guarded by mMutex
static sp<V2_0::IGnssMeasurementCallback> sCallback_2_0;
+
std::atomic<long> mMinIntervalMillis;
std::atomic<bool> mIsActive;
std::thread mThread;
+
+ // Synchronization lock for sCallback_2_1 and sCallback_2_0
mutable std::mutex mMutex;
};