commit 6fe6b4380a07766813edc4863721f3af8d5218b4
author Liz Prucka <lizprucka@google.com> Fri Aug 09 22:41:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 09 22:41:20 2024 +0000
tree ff3e1a0a0d99c77eac2cab87f20b449b5ea101e0
parent d577ef33a4584acb12cff07e085eff339762071b
parent ac078263407a7221bc99cff28c7ebd10b2b526e9

Merge "Error fix from enabling Clang thread-safety checks." into main

services/audioflinger/Threads.h

diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 43159d7..3871670 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -379,10 +379,10 @@
         return isOutput() ? outDeviceTypes_l() : DeviceTypeSet({inDeviceType_l()});
     }
 
-    const AudioDeviceTypeAddrVector& outDeviceTypeAddrs() const final {
+    const AudioDeviceTypeAddrVector& outDeviceTypeAddrs() const final REQUIRES(mutex()) {
         return mOutDeviceTypeAddrs;
     }
-    const AudioDeviceTypeAddr& inDeviceTypeAddr() const final {
+    const AudioDeviceTypeAddr& inDeviceTypeAddr() const final REQUIRES(mutex()) {
         return mInDeviceTypeAddr;
     }