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

Commit 3d652709 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Fix deadlock in cuttlefish/default implementation 

Bug: 150830099

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

Change-Id: I70aec19a481781d924ed3008765ca624a7eeb950
parent a51c8b9f

gnss/2.0/default/GnssMeasurement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ Return<V1_0::IGnssMeasurement::GnssMeasurementStatus> GnssMeasurement::setCallba 


Return<void> GnssMeasurement::close() {

    ALOGD("close");

    std::unique_lock<std::mutex> lock(mMutex);

    stop();

    std::unique_lock<std::mutex> lock(mMutex);

    sCallback = nullptr;

    return Void();

}

gnss/2.0/default/GnssMeasurement.h

+2 −0
Original line number Diff line number Diff line
@@ -61,10 +61,12 @@ struct GnssMeasurement : public IGnssMeasurement { 
    void stop();

    void reportMeasurement(const GnssData&);



    // Guarded by mMutex

    static sp<IGnssMeasurementCallback> sCallback;

    std::atomic<long> mMinIntervalMillis;

    std::atomic<bool> mIsActive;

    std::thread mThread;

    // Synchronization lock for sCallback

    mutable std::mutex mMutex;

};

gnss/2.1/default/GnssAntennaInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ Return<GnssAntennaInfo::GnssAntennaInfoStatus> GnssAntennaInfo::setCallback( 


Return<void> GnssAntennaInfo::close() {

    ALOGD("close");

    std::unique_lock<std::mutex> lock(mMutex);

    stop();

    std::unique_lock<std::mutex> lock(mMutex);

    sCallback = nullptr;

    return Void();

}

gnss/2.1/default/GnssAntennaInfo.h

+2 −0
Original line number Diff line number Diff line
@@ -47,10 +47,12 @@ struct GnssAntennaInfo : public IGnssAntennaInfo { 
    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;

};

gnss/2.1/default/GnssMeasurement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ Return<V1_0::IGnssMeasurement::GnssMeasurementStatus> GnssMeasurement::setCallba 


Return<void> GnssMeasurement::close() {

    ALOGD("close");

    std::unique_lock<std::mutex> lock(mMutex);

    stop();

    std::unique_lock<std::mutex> lock(mMutex);

    sCallback_2_1 = nullptr;

    sCallback_2_0 = nullptr;

    return Void();