diff options
| author | Rob Carr <racarr@google.com> | 2022-04-05 01:06:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-05 01:06:58 +0000 |
| commit | 33bef8d9af044ee47bec7b2fc9a696f8686a4f73 (patch) | |
| tree | eb7894ede490d30cc3d16549de3d6aee9c685186 /libs | |
| parent | 468a0d49e310b396a03b5d8a4c89a08412a76f7e (diff) | |
| parent | 2df7c451a58238bad1d0221af94a2fcb29dd4970 (diff) | |
| download | native-33bef8d9af044ee47bec7b2fc9a696f8686a4f73.tar.gz | |
Merge "TransactionCompletedListener: Mutex for getInstance" into tm-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 7182dc7de0..7a63af0ed3 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -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; } |