commit 3d652709ed40f8070c990bb275d3709d603d318e
author Yu-Han Yang <yuhany@google.com> Thu Mar 05 22:41:23 2020 -0800
committer Yu-Han Yang <yuhany@google.com> Fri Mar 06 07:34:58 2020 -0800
tree 71d2fb7a53b1209c06d854e3cebd7d5ca434bf41
parent a51c8b9f477ca7c2e7e2fff01a98decec2e0c392

Fix deadlock in cuttlefish/default implementation

Bug: 150830099

Test: atest LocationManagerFineTest#testRegisterGnssMeasurementsCallback
-c --iterations 100

Change-Id: I70aec19a481781d924ed3008765ca624a7eeb950

gnss/2.1/default/GnssAntennaInfo.h

diff --git a/gnss/2.1/default/GnssAntennaInfo.h b/gnss/2.1/default/GnssAntennaInfo.h
index f4bfd24..c512e4e 100644
--- a/gnss/2.1/default/GnssAntennaInfo.h
+++ b/gnss/2.1/default/GnssAntennaInfo.h
@@ -47,10 +47,12 @@
     void reportAntennaInfo(
             const hidl_vec<IGnssAntennaInfoCallback::GnssAntennaInfo>& antennaInfo) const;
 
+    // Guarded by mMutex
     static sp<IGnssAntennaInfoCallback> sCallback;
     std::atomic<long> mMinIntervalMillis;
     std::atomic<bool> mIsActive;
     std::thread mThread;
+    // Synchronization lock for sCallback
     mutable std::mutex mMutex;
 };