commit f3e15b1877d08b810269d54b30c75d9b45a3d017
author Liz Prucka <lizprucka@google.com> Tue Jul 30 14:45:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 30 14:45:14 2024 +0000
tree 27de53f4c87282d394a4eb13df0512f78e9b6ba0
parent cd66b5983af0d294ae5150ed8675ecfcba484fea
parent 8a738defc5157a5eb0a880bf60b631db240d547c

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

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index f08e78e..f61fdce 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -334,7 +334,9 @@
             const String8& address,
             audio_output_flags_t flags) final REQUIRES(mutex());
     const DefaultKeyedVector<audio_module_handle_t, AudioHwDevice*>&
-            getAudioHwDevs_l() const final REQUIRES(mutex()) { return mAudioHwDevs; }
+            getAudioHwDevs_l() const final REQUIRES(mutex(), hardwareMutex()) {
+              return mAudioHwDevs;
+            }
     void updateDownStreamPatches_l(const struct audio_patch* patch,
             const std::set<audio_io_handle_t>& streams) final REQUIRES(mutex());
     void updateOutDevicesForRecordThreads_l(const DeviceDescriptorBaseVector& devices) final