commit e0237bbe066bb27eb88b4c5d6a5485cf9c2dd45d
author Chavi Weingarten <chaviw@google.com> Mon Feb 06 21:48:32 2023 +0000
committer Chavi Weingarten <chaviw@google.com> Mon Feb 06 22:29:19 2023 +0000
tree 5ed87e281354c81a429061877f3f41b7bb11de96
parent b00dc402e264922632667e3656b5134a736e100a

Add thread safety check to libgui build

Fix places that had errors to ensure locks are correctly held in libgui

Test: Builds
Bug: 268091723
Change-Id: I8a94edeb649608ff66d25a482026a81074466305

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 9092f5f..ccd225c 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -53,6 +53,7 @@
 #include <ui/DisplayState.h>
 #include <ui/DynamicDisplayInfo.h>
 
+#include <android-base/thread_annotations.h>
 #include <private/gui/ComposerService.h>
 #include <private/gui/ComposerServiceAIDL.h>
 
@@ -2988,6 +2989,7 @@
     while (true) {
         {
             std::unique_lock<std::mutex> lock(mMutex);
+            base::ScopedLockAssertion assumeLocked(mMutex);
             callbackInfos = std::move(mCallbackInfos);
             mCallbackInfos = {};
         }
@@ -3000,6 +3002,7 @@
 
         {
             std::unique_lock<std::mutex> lock(mMutex);
+            base::ScopedLockAssertion assumeLocked(mMutex);
             if (mCallbackInfos.size() == 0) {
                 mReleaseCallbackPending.wait(lock);
             }