commit f85c5e3dabec6b521692dfe5de72a8b3749919ed
author David Li <dvdli@google.com> Mon Jul 01 13:14:10 2024 +0000
committer David Li <dvdli@google.com> Mon Jul 01 13:24:46 2024 +0000
tree 950a7bf9994e8361b0f117a2c798361cb4441987
parent 3e63e28fffc41040c0148dc631c084c77df84f54

delay rx-telephony patch creation to avoid playing ringtone

Bug: 343146206
Test: mm; manually test
Flag: EXEMPT bugfix
Change-Id: Ibe4735de13bd28f1f03c362557ec6322b7bfb249

services/audiopolicy/managerdefault/AudioPolicyManager.h

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index f899cd5..98853ce 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -707,7 +707,7 @@
         void updateCallAndOutputRouting(bool forceVolumeReeval = true, uint32_t delayMs = 0,
                 bool skipDelays = false);
 
-        void connectTelephonyRxAudioSource();
+        void connectTelephonyRxAudioSource(uint32_t delayMs);
 
         void disconnectTelephonyAudioSource(sp<SourceClientDescriptor> &clientDesc);
 
@@ -932,7 +932,8 @@
 
         status_t hasPrimaryOutput() const { return mPrimaryOutput != 0; }
 
-        status_t connectAudioSource(const sp<SourceClientDescriptor>& sourceDesc);
+        status_t connectAudioSource(const sp<SourceClientDescriptor>& sourceDesc,
+                                    uint32_t delayMs);
         status_t disconnectAudioSource(const sp<SourceClientDescriptor>& sourceDesc);
 
         status_t connectAudioSourceToSink(const sp<SourceClientDescriptor>& sourceDesc,
@@ -975,7 +976,8 @@
                                           audio_port_handle_t *portId,
                                           uid_t uid,
                                           bool internal,
-                                          bool isCallRx);
+                                          bool isCallRx,
+                                          uint32_t delayMs);
         const uid_t mUidCached;                         // AID_AUDIOSERVER
         sp<const AudioPolicyConfig> mConfig;
         EngineInstance mEngine;                         // Audio Policy Engine instance