Merge "FenceTimeline: Fix a potential race condition" into qt-dev

}

void FenceTimeline::updateSignalTimes() {

    while (!mQueue.empty()) {

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

    while (!mQueue.empty()) {

        std::shared_ptr<FenceTime> fence = mQueue.front().lock();

        if (!fence) {

            // The shared_ptr no longer exists and no one cares about the

#include <ui/Fence.h>

#include <utils/Flattenable.h>

#include <utils/Mutex.h>

#include <utils/Timers.h>

#include <atomic>

private:

    mutable std::mutex mMutex;

    std::queue<std::weak_ptr<FenceTime>> mQueue;

    std::queue<std::weak_ptr<FenceTime>> mQueue GUARDED_BY(mMutex);

};

// Used by test code to create or get FenceTimes for a given Fence.