commit 3634612854bdec61594da5d6cffb8ee509b9a8a1
author Andy Hung <hunga@google.com> Thu Aug 31 15:24:24 2023 -0700
committer Andy Hung <hunga@google.com> Mon Oct 09 17:39:36 2023 -0700
tree 6f5d1d192516333cc79624633faa2f544168f794
parent 51c7a1e99cb6c165d84d9fe74526ba5e9a18fe94

Add AudioFlinger to PatchPanel thread safety annotations

Test: atest AudioTrackTest AudioRecordTest
Test: atest AAudioTests AudioTrackOffloadTest
Test: atest AudioPlaybackCaptureTest
Test: Camera YouTube
Bug: 275748373
Merged-In: I50aaf6a5fdb3bd9dd9584dd11c6e1ab5b3a1d540
Change-Id: I50aaf6a5fdb3bd9dd9584dd11c6e1ab5b3a1d540

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index f5ee5b9..c3c8c1c 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -4563,7 +4563,7 @@
         struct audio_port* ports) const
 {
     audio_utils::lock_guard _l(mutex());
-    return mPatchPanel->listAudioPorts(num_ports, ports);
+    return mPatchPanel->listAudioPorts_l(num_ports, ports);
 }
 
 /* Get supported attributes for a given audio port */
@@ -4574,7 +4574,7 @@
     }
 
     audio_utils::lock_guard _l(mutex());
-    return mPatchPanel->getAudioPort(port);
+    return mPatchPanel->getAudioPort_l(port);
 }
 
 /* Connect a patch between several source and sink ports */
@@ -4587,14 +4587,14 @@
     }
 
     audio_utils::lock_guard _l(mutex());
-    return mPatchPanel->createAudioPatch(patch, handle);
+    return mPatchPanel->createAudioPatch_l(patch, handle);
 }
 
 /* Disconnect a patch */
 status_t AudioFlinger::releaseAudioPatch(audio_patch_handle_t handle)
 {
     audio_utils::lock_guard _l(mutex());
-    return mPatchPanel->releaseAudioPatch(handle);
+    return mPatchPanel->releaseAudioPatch_l(handle);
 }
 
 /* List connected audio ports and they attributes */
@@ -4602,7 +4602,7 @@
         unsigned int* num_patches, struct audio_patch* patches) const
 {
     audio_utils::lock_guard _l(mutex());
-    return mPatchPanel->listAudioPatches(num_patches, patches);
+    return mPatchPanel->listAudioPatches_l(num_patches, patches);
 }
 
 // ----------------------------------------------------------------------------