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

Commit 5bdc41d8 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "TransactionCompletedListener: Mutex for getInstance" into tm-dev am: 33bef8d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17573290



Change-Id: Iaf4d28985f59e584b5c4756f78ef15d41da4ed26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34e8f227 33bef8d9

libs/gui/SurfaceComposerClient.cpp

+2 −0
Original line number Diff line number Diff line
@@ -208,12 +208,14 @@ int64_t TransactionCompletedListener::getNextIdLocked() { 
}



sp<TransactionCompletedListener> TransactionCompletedListener::sInstance = nullptr;

static std::mutex sListenerInstanceMutex;



void TransactionCompletedListener::setInstance(const sp<TransactionCompletedListener>& listener) {

    sInstance = listener;

}



sp<TransactionCompletedListener> TransactionCompletedListener::getInstance() {

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

    if (sInstance == nullptr) {

        sInstance = new TransactionCompletedListener;

    }