commit 963dbcc03643907265ad52e1a8e17368a7d48063
author Eric Laurent <elaurent@google.com> Thu Jun 20 12:34:15 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 10 05:12:34 2024 +0000
tree 1441a4dd67a90da39344bf0433a91d014591bbb6
parent a9938d660d1a11e109d49e83110942eaf0b7c1cc

audio policy: refactor audio source client descriptor

Make the SourceClientDescriptor carry the information that it
is used for call TX ot TX patch instead of relying on the comparison
with mCallRxSourceClient and mCallTxSourceClient.

Flag: EXEMPT mechanical refactoring
Bug: 292492229
Test: make
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ccbd787b3eab93e8cf8ac7698ab007db4f65eb32)
Merged-In: I60f07bab8092046df717eb934846534c7c97dc37
Change-Id: I60f07bab8092046df717eb934846534c7c97dc37

services/audiopolicy/managerdefault/AudioPolicyManager.h

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 011e867..84d0f8d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -345,8 +345,7 @@
         virtual status_t startAudioSource(const struct audio_port_config *source,
                                           const audio_attributes_t *attributes,
                                           audio_port_handle_t *portId,
-                                          uid_t uid,
-                                          bool internal = false);
+                                          uid_t uid);
         virtual status_t stopAudioSource(audio_port_handle_t portId);
 
         virtual status_t setMasterMono(bool mono);
@@ -705,14 +704,6 @@
         void updateCallAndOutputRouting(bool forceVolumeReeval = true, uint32_t delayMs = 0,
                 bool skipDelays = false);
 
-        bool isCallRxAudioSource(const sp<SourceClientDescriptor> &source) {
-            return mCallRxSourceClient != nullptr && source == mCallRxSourceClient;
-        }
-
-        bool isCallTxAudioSource(const sp<SourceClientDescriptor> &source) {
-            return mCallTxSourceClient != nullptr && source == mCallTxSourceClient;
-        }
-
         void connectTelephonyRxAudioSource();
 
         void disconnectTelephonyAudioSource(sp<SourceClientDescriptor> &clientDesc);
@@ -976,6 +967,12 @@
         void checkLeBroadcastRoutes(bool wasUnicastActive,
                 sp<SwAudioOutputDescriptor> ignoredOutput, uint32_t delayMs);
 
+        status_t startAudioSourceInternal(const struct audio_port_config *source,
+                                          const audio_attributes_t *attributes,
+                                          audio_port_handle_t *portId,
+                                          uid_t uid,
+                                          bool internal,
+                                          bool isCallRx);
         const uid_t mUidCached;                         // AID_AUDIOSERVER
         sp<const AudioPolicyConfig> mConfig;
         EngineInstance mEngine;                         // Audio Policy Engine instance